From 24abe1646e24caca79cd649f71cd4806a488ee7d Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Wed, 8 Jul 2020 18:08:25 -0700 Subject: [PATCH 1/2] Disable 44056 test with debug on macos. --- src/test/codegen/issue-44056-macos-tls-align.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/codegen/issue-44056-macos-tls-align.rs b/src/test/codegen/issue-44056-macos-tls-align.rs index eee59be629bb6..5abbfa5dd24bb 100644 --- a/src/test/codegen/issue-44056-macos-tls-align.rs +++ b/src/test/codegen/issue-44056-macos-tls-align.rs @@ -1,6 +1,7 @@ // ignore-tidy-linelength // only-macos // no-system-llvm +// ignore-debug: the debug assertions get in the way // compile-flags: -O #![crate_type = "rlib"] From 9f91a9540d5058eb7b384d1a58e81a4672fea7b4 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Thu, 9 Jul 2020 10:20:52 -0700 Subject: [PATCH 2/2] Ignore changes when debug assertions are enabled. --- src/test/codegen/issue-44056-macos-tls-align.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/codegen/issue-44056-macos-tls-align.rs b/src/test/codegen/issue-44056-macos-tls-align.rs index 5abbfa5dd24bb..2270eca501428 100644 --- a/src/test/codegen/issue-44056-macos-tls-align.rs +++ b/src/test/codegen/issue-44056-macos-tls-align.rs @@ -1,18 +1,18 @@ // ignore-tidy-linelength // only-macos // no-system-llvm -// ignore-debug: the debug assertions get in the way // compile-flags: -O #![crate_type = "rlib"] #![feature(thread_local)] -// CHECK: @STATIC_VAR_1 = thread_local local_unnamed_addr global <{ [32 x i8] }> zeroinitializer, section "__DATA,__thread_bss", align 4 +// local_unnamed_addr does not appear when std is built with debug assertions. +// CHECK: @STATIC_VAR_1 = thread_local {{(local_unnamed_addr )?}}global <{ [32 x i8] }> zeroinitializer, section "__DATA,__thread_bss", align 4 #[no_mangle] #[thread_local] static mut STATIC_VAR_1: [u32; 8] = [0; 8]; -// CHECK: @STATIC_VAR_2 = thread_local local_unnamed_addr global <{ [32 x i8] }> <{{[^>]*}}>, section "__DATA,__thread_data", align 4 +// CHECK: @STATIC_VAR_2 = thread_local {{(local_unnamed_addr )?}}global <{ [32 x i8] }> <{{[^>]*}}>, section "__DATA,__thread_data", align 4 #[no_mangle] #[thread_local] static mut STATIC_VAR_2: [u32; 8] = [4; 8];