Rollup merge of #110455 - durin42:tls-D148269-fix, r=nikic

tests: adapt for LLVM change 5b386b864c7619897c51a1da97d78f1cf6f3eff6

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.
This commit is contained in:
Matthias Krüger 2023-04-17 18:13:37 +02:00 committed by GitHub
commit c81e8b8e18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -20,8 +20,8 @@ thread_local!(static A: Cell<u32> = const { Cell::new(1) });
// CHECK-LABEL: @get // CHECK-LABEL: @get
#[no_mangle] #[no_mangle]
fn get() -> u32 { fn get() -> u32 {
// CHECK: %0 = load i32, {{.*}}[[TLS]]{{.*}} // CHECK: [[RET_0:%.+]] = load i32, {{.*}}[[TLS]]{{.*}}
// CHECK-NEXT: ret i32 %0 // CHECK-NEXT: ret i32 [[RET_0]]
A.with(|a| a.get()) A.with(|a| a.get())
} }
@ -36,8 +36,8 @@ fn set(v: u32) {
// CHECK-LABEL: @get_aux // CHECK-LABEL: @get_aux
#[no_mangle] #[no_mangle]
fn get_aux() -> u64 { fn get_aux() -> u64 {
// CHECK: %0 = load i64, {{.*}}[[TLS_AUX]] // CHECK: [[RET_1:%.+]] = load i64, {{.*}}[[TLS_AUX]]
// CHECK-NEXT: ret i64 %0 // CHECK-NEXT: ret i64 [[RET_1]]
aux::A.with(|a| a.get()) aux::A.with(|a| a.get())
} }