From 853feb6964a9d531d802573f5a44d85e4d2a41b6 Mon Sep 17 00:00:00 2001
From: Krasimir Georgiev <Mister Nobody the Robot>
Date: Mon, 17 Jan 2022 15:57:08 +0100
Subject: [PATCH 1/2] update codegen test for LLVM 14

Fixes https://github.com/rust-lang/rust/issues/93003.
---
 src/test/codegen/thread-local.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/codegen/thread-local.rs b/src/test/codegen/thread-local.rs
index 5ac30d949fa..c6bb27cbd74 100644
--- a/src/test/codegen/thread-local.rs
+++ b/src/test/codegen/thread-local.rs
@@ -19,7 +19,7 @@ thread_local!(static A: Cell<u32> = const { Cell::new(1) });
 // CHECK-LABEL: @get
 #[no_mangle]
 fn get() -> u32 {
-    // CHECK: %0 = load i32, i32* bitcast ({{.*}} [[TLS]] to i32*)
+    // CHECK: %0 = load i32, i32* [[TLS]], align 4
     // CHECK-NEXT: ret i32 %0
     A.with(|a| a.get())
 }
@@ -27,7 +27,7 @@ fn get() -> u32 {
 // CHECK-LABEL: @set
 #[no_mangle]
 fn set(v: u32) {
-    // CHECK: store i32 %0, i32* bitcast ({{.*}} [[TLS]] to i32*)
+    // CHECK: store i32 %0, i32* [[TLS]], align 4
     // CHECK-NEXT: ret void
     A.with(|a| a.set(v))
 }

From e4607ff9804f3d2ae7feaf7d76fae48a52d798c3 Mon Sep 17 00:00:00 2001
From: Krasimir Georgiev <Mister Nobody the Robot>
Date: Mon, 17 Jan 2022 16:20:46 +0100
Subject: [PATCH 2/2] update test assertion

---
 src/test/codegen/thread-local.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/codegen/thread-local.rs b/src/test/codegen/thread-local.rs
index c6bb27cbd74..c59b088f7a6 100644
--- a/src/test/codegen/thread-local.rs
+++ b/src/test/codegen/thread-local.rs
@@ -19,7 +19,7 @@ thread_local!(static A: Cell<u32> = const { Cell::new(1) });
 // CHECK-LABEL: @get
 #[no_mangle]
 fn get() -> u32 {
-    // CHECK: %0 = load i32, i32* [[TLS]], align 4
+    // CHECK: %0 = load i32, i32* {{.*}}[[TLS]]{{.*}}
     // CHECK-NEXT: ret i32 %0
     A.with(|a| a.get())
 }
@@ -27,7 +27,7 @@ fn get() -> u32 {
 // CHECK-LABEL: @set
 #[no_mangle]
 fn set(v: u32) {
-    // CHECK: store i32 %0, i32* [[TLS]], align 4
+    // CHECK: store i32 %0, i32* {{.*}}[[TLS]]{{.*}}
     // CHECK-NEXT: ret void
     A.with(|a| a.set(v))
 }