diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-17 18:13:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 18:13:37 +0200 |
| commit | c81e8b8e18253881334e4f4ca7a707c8eccbb905 (patch) | |
| tree | 71b777fef0884cdd3f05a9b9188fafe427f8cabe | |
| parent | a76b157624ff4ec3ce1b61ac495fb3043be72bbd (diff) | |
| parent | bef3502dbae607fba8d3a7ea209191f9b80b9e91 (diff) | |
| download | rust-c81e8b8e18253881334e4f4ca7a707c8eccbb905.tar.gz rust-c81e8b8e18253881334e4f4ca7a707c8eccbb905.zip | |
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.
| -rw-r--r-- | tests/codegen/thread-local.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/codegen/thread-local.rs b/tests/codegen/thread-local.rs index aa7fab7fb17..caf0366d2c1 100644 --- a/tests/codegen/thread-local.rs +++ b/tests/codegen/thread-local.rs @@ -20,8 +20,8 @@ thread_local!(static A: Cell<u32> = const { Cell::new(1) }); // CHECK-LABEL: @get #[no_mangle] fn get() -> u32 { - // CHECK: %0 = load i32, {{.*}}[[TLS]]{{.*}} - // CHECK-NEXT: ret i32 %0 + // CHECK: [[RET_0:%.+]] = load i32, {{.*}}[[TLS]]{{.*}} + // CHECK-NEXT: ret i32 [[RET_0]] A.with(|a| a.get()) } @@ -36,8 +36,8 @@ fn set(v: u32) { // CHECK-LABEL: @get_aux #[no_mangle] fn get_aux() -> u64 { - // CHECK: %0 = load i64, {{.*}}[[TLS_AUX]] - // CHECK-NEXT: ret i64 %0 + // CHECK: [[RET_1:%.+]] = load i64, {{.*}}[[TLS_AUX]] + // CHECK-NEXT: ret i64 [[RET_1]] aux::A.with(|a| a.get()) } |