Skip to content

Commit c81e8b8

Browse files
authored
Rollup merge of rust-lang#110455 - durin42:tls-D148269-fix, r=nikic
tests: adapt for LLVM change 5b386b8 The above-mentioned change modified the output of thread-local.rs by changing some variable names. Rather than assume things get put in %0, we capture the variable so the test passes in both the old and new version.
2 parents a76b157 + bef3502 commit c81e8b8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tests/codegen/thread-local.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ thread_local!(static A: Cell<u32> = const { Cell::new(1) });
2020
// CHECK-LABEL: @get
2121
#[no_mangle]
2222
fn get() -> u32 {
23-
// CHECK: %0 = load i32, {{.*}}[[TLS]]{{.*}}
24-
// CHECK-NEXT: ret i32 %0
23+
// CHECK: [[RET_0:%.+]] = load i32, {{.*}}[[TLS]]{{.*}}
24+
// CHECK-NEXT: ret i32 [[RET_0]]
2525
A.with(|a| a.get())
2626
}
2727

@@ -36,8 +36,8 @@ fn set(v: u32) {
3636
// CHECK-LABEL: @get_aux
3737
#[no_mangle]
3838
fn get_aux() -> u64 {
39-
// CHECK: %0 = load i64, {{.*}}[[TLS_AUX]]
40-
// CHECK-NEXT: ret i64 %0
39+
// CHECK: [[RET_1:%.+]] = load i64, {{.*}}[[TLS_AUX]]
40+
// CHECK-NEXT: ret i64 [[RET_1]]
4141
aux::A.with(|a| a.get())
4242
}
4343

0 commit comments

Comments
 (0)