diff options
| author | bors <bors@rust-lang.org> | 2020-07-16 19:01:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-16 19:01:48 +0000 |
| commit | 5c9e5df3a097e094641f16dab501ab1c4da10e9f (patch) | |
| tree | efbe559cc0c2e00c0bb7b690975388002d00f06f /src/test/codegen | |
| parent | 6ee1b62c811a6eb68d6db6dfb91f66a49956749b (diff) | |
| parent | ff685f51f4f130d4080ef800e5e041ddbca903dc (diff) | |
| download | rust-5c9e5df3a097e094641f16dab501ab1c4da10e9f.tar.gz rust-5c9e5df3a097e094641f16dab501ab1c4da10e9f.zip | |
Auto merge of #74408 - Manishearth:rollup-9gxn4od, r=Manishearth
Rollup of 21 pull requests Successful merges: - #73566 (Don't run `everybody_loops` for rustdoc; instead ignore resolution errors) - #73771 (Don't pollute docs/suggestions with libstd deps) - #73794 (Small cleanup for E0705 explanation) - #73807 (rustdoc: glue tokens before highlighting) - #73835 (Clean up E0710 explanation) - #73926 (Ignoring test case: [codegen] repr-transparent-aggregates-1.rs for aarch64) - #73981 (Remove some `ignore-stage1` annotations.) - #73998 (add regression test for #61216) - #74140 (Make hir ProjectionKind more precise) - #74148 (Move #[doc(alias)] check in rustc) - #74159 (forbid generic params in the type of const params) - #74171 (Fix 44056 test with debug on macos.) - #74221 (Don't panic if the lhs of a div by zero is not statically known) - #74325 (Focus on the current file in the source file sidebar) - #74359 (rustdoc: Rename internal API fns to `into_string`) - #74370 (Reintroduce spotlight / "important traits" feature) - #74390 (Fix typo in std::mem::transmute documentation) - #74391 (BtreeMap: superficially refactor root access) - #74392 (const generics triage) - #74397 (Fix typo in the latest release note) - #74406 (Set shell for github actions CI) Failed merges: r? @ghost
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/issue-44056-macos-tls-align.rs | 5 | ||||
| -rw-r--r-- | src/test/codegen/repr-transparent-aggregates-1.rs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/codegen/issue-44056-macos-tls-align.rs b/src/test/codegen/issue-44056-macos-tls-align.rs index eee59be629b..2270eca5014 100644 --- a/src/test/codegen/issue-44056-macos-tls-align.rs +++ b/src/test/codegen/issue-44056-macos-tls-align.rs @@ -6,12 +6,13 @@ #![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]; diff --git a/src/test/codegen/repr-transparent-aggregates-1.rs b/src/test/codegen/repr-transparent-aggregates-1.rs index c23c57c8c59..59f29e756fc 100644 --- a/src/test/codegen/repr-transparent-aggregates-1.rs +++ b/src/test/codegen/repr-transparent-aggregates-1.rs @@ -3,6 +3,7 @@ // min-system-llvm-version: 9.0 // ignore-arm +// ignore-aarch64 // ignore-mips // ignore-mips64 // ignore-powerpc |