Skip to content

Commit 14d0d51

Browse files
authored
Rollup merge of #83328 - tmiasko:asm-test, r=joshtriplett
Fixes to inline assmebly tests * Join test thread to make assertion effective in sym.rs test case * Use a single codegen unit to reduce non-determinism in srcloc.rs test #82886
2 parents 5473b6d + 3d64f8d commit 14d0d51

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/test/ui/asm/srcloc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// min-llvm-version: 10.0.1
22
// only-x86_64
33
// build-fail
4-
4+
// compile-flags: -Ccodegen-units=1
55
#![feature(asm)]
66

77
// Checks that inline asm errors are mapped to the correct line in the source code.

src/test/ui/asm/sym.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@ fn main() {
7676
std::thread::spawn(|| {
7777
assert_eq!(static_addr!(S1), &S1 as *const u32);
7878
assert_eq!(static_tls_addr!(S2), &S2 as *const u32);
79-
});
79+
}).join().unwrap();
8080
}

0 commit comments

Comments
 (0)