[clang] f9c4aa6 - [CIR] Make LoweringPrepare safe to rerun on TLS globals (#237376)

via cfe-commits cfe-commits at lists.llvm.org
Wed Nov 4 14:58:18 PST 2026


Author: Konstantinos Parasyris
Date: 2026-11-04T14:58:13-08:00
New Revision: f9c4aa60604044ecdc8a4d47dbce3dd65893e76e

URL: https://github.com/llvm/llvm-project/commit/f9c4aa60604044ecdc8a4d47dbce3dd65893e76e
DIFF: https://github.com/llvm/llvm-project/commit/f9c4aa60604044ecdc8a4d47dbce3dd65893e76e.diff

LOG: [CIR] Make LoweringPrepare safe to rerun on TLS globals (#237376)

LoweringPrepare builds the wrapper (`_ZTW*`) and init alias (`_ZTH*`) of
each thread-local global from its `tls_refs` attribute, but leaves the
attribute in place. Running the pass again on its own output, e.g. on an emitted
`.cir` file, rebuilds the wrappers and fails:
```
    error: redefinition of symbol named '_ZTW2tl'
```

This was partially discovered in this discussion: #234013 . The solution
is to drop the `tls_refs` attribute after the pass consumes it.

Added: 
    clang/test/CIR/Transforms/lowering-prepare-tls-rerun.cir

Modified: 
    clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
    clang/test/CIR/CodeGen/global-temp-dtor.cpp
    clang/test/CIR/CodeGen/global-tls-dyn-init.cpp
    clang/test/CIR/CodeGen/global-tls-dynamic-vs-static.cpp
    clang/test/CIR/CodeGen/global-tls-simple-init.cpp
    clang/test/CIR/CodeGen/global-tls-templates.cpp
    clang/test/CIR/CodeGen/tls-model.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp b/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
index 6e4e82e3f851e..ae9ffffd07290 100644
--- a/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
+++ b/clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp
@@ -3504,6 +3504,12 @@ void LoweringPreparePass::runOnOperation() {
   for (mlir::Operation *o : opsToTransform)
     runOnOp(o);
 
+  // Every TLS wrapper, init alias and wrapper call has been built from
+  // 'tls_refs' by now. Nothing after this pass reads it, so drop it to keep a
+  // second run of this pass from building the wrappers again.
+  for (auto globalOp : mlirModule.getOps<cir::GlobalOp>())
+    globalOp.removeTlsRefsAttr();
+
   buildCXXGlobalInitFunc();
   buildCXXGlobalTlsFunc();
   if (getLangOpts().CUDA && !getLangOpts().CUDAIsDevice) {

diff  --git a/clang/test/CIR/CodeGen/global-temp-dtor.cpp b/clang/test/CIR/CodeGen/global-temp-dtor.cpp
index 3abe1bdfd16d1..2b953fd6b9654 100644
--- a/clang/test/CIR/CodeGen/global-temp-dtor.cpp
+++ b/clang/test/CIR/CodeGen/global-temp-dtor.cpp
@@ -64,7 +64,7 @@ thread_local const NonTrivialArr &thread_arr_ref = NonTrivialArr{};
 // CIR-BEFORE: }
 // CIR-BEFORE: cir.global "private" internal tls_model = tls_dyn @_ZGR10thread_ref_ = #cir.zero : !rec_NonTrivial
 
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW10thread_ref", "_ZTH10thread_ref"> @thread_ref = #cir.ptr<null> : !cir.ptr<!rec_NonTrivial>
+// CIR: cir.global external tls_model = tls_dyn @thread_ref = #cir.ptr<null> : !cir.ptr<!rec_NonTrivial>
 // CIR: cir.func internal private @__cxx_global_var_init.1()
 // CIR:   cir.get_global thread_local @thread_ref
 // CIR:   cir.get_global @_ZGR10thread_ref_
@@ -139,7 +139,7 @@ thread_local const NonTrivialArr &thread_arr_ref = NonTrivialArr{};
 // CIR-BEFORE: }
 // CIR-BEFORE: cir.global "private" internal tls_model = tls_dyn @_ZGR14thread_arr_ref_ = #cir.zero : !cir.array<!rec_NonTrivial x 2>
 
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW14thread_arr_ref", "_ZTH14thread_arr_ref"> @thread_arr_ref = #cir.ptr<null> : !cir.ptr<!cir.array<!rec_NonTrivial x 2>>
+// CIR: cir.global external tls_model = tls_dyn @thread_arr_ref = #cir.ptr<null> : !cir.ptr<!cir.array<!rec_NonTrivial x 2>>
 // CIR: cir.func internal private @__cxx_global_var_init.3()
 // CIR:   cir.call @_ZN10NonTrivialC1Ev
 // CIR:   cir.get_global @__cxx_global_array_dtor.1

diff  --git a/clang/test/CIR/CodeGen/global-tls-dyn-init.cpp b/clang/test/CIR/CodeGen/global-tls-dyn-init.cpp
index 0a0cc48035b0e..9fe2a5873eaa0 100644
--- a/clang/test/CIR/CodeGen/global-tls-dyn-init.cpp
+++ b/clang/test/CIR/CodeGen/global-tls-dyn-init.cpp
@@ -104,7 +104,7 @@ thread_local CtorDtor tls_cd = 5;
 // CIR-BEFORE-LPP:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_cd : !cir.ptr<!rec_CtorDtor>
 // CIR-BEFORE-LPP:   cir.call @_ZN8CtorDtorD1Ev(%[[GET_GLOB]]) : (!cir.ptr<!rec_CtorDtor>) -> ()
 // CIR-BEFORE-LPP: }
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW6tls_cd", "_ZTH6tls_cd"> @tls_cd = #cir.const_record<{#cir.int<5> : !s32i}> : !rec_CtorDtor
+// CIR: cir.global external tls_model = tls_dyn @tls_cd = #cir.const_record<{#cir.int<5> : !s32i}> : !rec_CtorDtor
 // CIR: cir.func internal private @[[TLS_CD_INIT]]() {
 // CIR:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_cd : !cir.ptr<!rec_CtorDtor>
 // CIR:   %[[GET_DTOR:.*]] = cir.get_global @_ZN8CtorDtorD1Ev : !cir.ptr<!cir.func<(!cir.ptr<!rec_CtorDtor>)>>
@@ -130,7 +130,7 @@ thread_local CtorDtor tls_cd_dyn = get_i();
 // CIR-BEFORE-LPP:    %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_cd_dyn : !cir.ptr<!rec_CtorDtor>
 // CIR-BEFORE-LPP:    cir.call @_ZN8CtorDtorD1Ev(%[[GET_GLOB]]) : (!cir.ptr<!rec_CtorDtor>) -> ()
 // CIR-BEFORE-LPP:  }
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW10tls_cd_dyn", "_ZTH10tls_cd_dyn"> @tls_cd_dyn = #cir.zero : !rec_CtorDtor
+// CIR: cir.global external tls_model = tls_dyn @tls_cd_dyn = #cir.zero : !rec_CtorDtor
 // CIR: cir.func internal private @[[TLS_CD_DYN_INIT]]() {
 // CIR:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_cd_dyn : !cir.ptr<!rec_CtorDtor>
 // CIR:   %[[CALL:.*]] = cir.call @_Z5get_iv() : () -> (!s32i {llvm.noundef})
@@ -160,7 +160,7 @@ thread_local CtorDtor &tls_cd_ref = tls_cd_dyn;
 // CIR-BEFORE-LPP:   %[[CALL:.*]] = cir.get_global thread_local @tls_cd_dyn : !cir.ptr<!rec_CtorDtor>
 // CIR-BEFORE-LPP:   cir.store {{.*}}%[[CALL]], %[[GET_GLOB]] : !cir.ptr<!rec_CtorDtor>, !cir.ptr<!cir.ptr<!rec_CtorDtor>>
 // CIR-BEFORE-LPP: }
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW10tls_cd_ref", "_ZTH10tls_cd_ref"> @tls_cd_ref = #cir.ptr<null> : !cir.ptr<!rec_CtorDtor>
+// CIR: cir.global external tls_model = tls_dyn @tls_cd_ref = #cir.ptr<null> : !cir.ptr<!rec_CtorDtor>
 // CIR: cir.func internal private @[[TLS_CD_REF_INIT]]() {
 // CIR:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_cd_ref : !cir.ptr<!cir.ptr<!rec_CtorDtor>>
 // CIR:   %[[GET_DYN:.*]] = cir.call @_ZTW10tls_cd_dyn() : () -> !cir.ptr<!rec_CtorDtor>
@@ -190,7 +190,7 @@ thread_local CtorDtor tls_cd_dyn_not_used = get_i();
 // CIR-BEFORE-LPP:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_cd_dyn_not_used : !cir.ptr<!rec_CtorDtor>
 // CIR-BEFORE-LPP:   cir.call @_ZN8CtorDtorD1Ev(%[[GET_GLOB]]) : (!cir.ptr<!rec_CtorDtor>) -> ()
 // CIR-BEFORE-LPP: }
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW19tls_cd_dyn_not_used", "_ZTH19tls_cd_dyn_not_used"> @tls_cd_dyn_not_used = #cir.zero : !rec_CtorDtor
+// CIR: cir.global external tls_model = tls_dyn @tls_cd_dyn_not_used = #cir.zero : !rec_CtorDtor
 // CIR: cir.func internal private @[[TLS_CD_DYN_NOT_USED_INIT]]() {
 // CIR:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_cd_dyn_not_used : !cir.ptr<!rec_CtorDtor>
 // CIR:   %[[CALL:.*]] = cir.call @_Z5get_iv() : () -> (!s32i {llvm.noundef})

diff  --git a/clang/test/CIR/CodeGen/global-tls-dynamic-vs-static.cpp b/clang/test/CIR/CodeGen/global-tls-dynamic-vs-static.cpp
index c6442a0e3cc59..39376a572ea61 100644
--- a/clang/test/CIR/CodeGen/global-tls-dynamic-vs-static.cpp
+++ b/clang/test/CIR/CodeGen/global-tls-dynamic-vs-static.cpp
@@ -21,11 +21,11 @@ thread_local  int d = f();
 // CIR-DAG: cir.func internal private @__tls_init()
 // CIR-DAG: cir.func internal private @__cxx_global_var_init()
 
-// CIR-DAG: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW1c", "_ZTH1c"> @c = #cir.int<5> : !s32i
+// CIR-DAG: cir.global external tls_model = tls_dyn @c = #cir.int<5> : !s32i
 // CIR-DAG: cir.func comdat weak_odr private hidden @_ZTW1c()
 // Note: C doesn't get an alias since it doesn't have an init function.
 
-// CIR-DAG: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW1d", "_ZTH1d"> @d = #cir.int<0> : !s32i
+// CIR-DAG: cir.global external tls_model = tls_dyn @d = #cir.int<0> : !s32i
 // CIR-DAG: cir.func comdat weak_odr private hidden @_ZTW1d() -> !cir.ptr<!s32i>
 // CIR-DAG: cir.func @_ZTH1d() alias(@__tls_init)
 

diff  --git a/clang/test/CIR/CodeGen/global-tls-simple-init.cpp b/clang/test/CIR/CodeGen/global-tls-simple-init.cpp
index af6c9fe8695dd..1b753b1fad2cf 100644
--- a/clang/test/CIR/CodeGen/global-tls-simple-init.cpp
+++ b/clang/test/CIR/CodeGen/global-tls-simple-init.cpp
@@ -141,7 +141,7 @@ struct CtorDtor {
 
 thread_local int tls_int = 5;
 // CIR-BEFORE-LPP: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW7tls_int", "_ZTH7tls_int"> @tls_int = #cir.int<5> : !s32i
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW7tls_int", "_ZTH7tls_int"> @tls_int = #cir.int<5> : !s32i
+// CIR: cir.global external tls_model = tls_dyn @tls_int = #cir.int<5> : !s32i
 
 thread_local int tls_int_dyn = get_i();
 // CIR-BEFORE-LPP: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW11tls_int_dyn", "_ZTH11tls_int_dyn"> @tls_int_dyn = #cir.int<0> : !s32i ctor {
@@ -149,7 +149,7 @@ thread_local int tls_int_dyn = get_i();
 // CIR-BEFORE-LPP:   %[[CALL:.*]] = cir.call @_Z5get_iv() : () -> (!s32i {llvm.noundef})
 // CIR-BEFORE-LPP:   cir.store {{.*}}%[[CALL]], %[[GET_GLOB]] : !s32i, !cir.ptr<!s32i>
 // CIR-BEFORE-LPP: }
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW11tls_int_dyn", "_ZTH11tls_int_dyn"> @tls_int_dyn = #cir.int<0> : !s32i
+// CIR: cir.global external tls_model = tls_dyn @tls_int_dyn = #cir.int<0> : !s32i
 // CIR: cir.func internal private @[[TLS_INT_DYN_INIT]]() {
 // CIR:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_int_dyn : !cir.ptr<!s32i>
 // CIR:   %[[CALL:.*]] = cir.call @_Z5get_iv() : () -> (!s32i {llvm.noundef})
@@ -169,7 +169,7 @@ thread_local int &tls_int_ref = tls_int_dyn;
 // CIR-BEFORE-LPP:   %[[GET_OTHER:.*]] = cir.get_global thread_local @tls_int_dyn : !cir.ptr<!s32i>
 // CIR-BEFORE-LPP:   cir.store {{.*}}%[[GET_OTHER]], %[[GET_GLOB]] : !cir.ptr<!s32i>, !cir.ptr<!cir.ptr<!s32i>>
 // CIR-BEFORE-LPP: }
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW11tls_int_ref", "_ZTH11tls_int_ref"> @tls_int_ref = #cir.ptr<null> : !cir.ptr<!s32i>
+// CIR: cir.global external tls_model = tls_dyn @tls_int_ref = #cir.ptr<null> : !cir.ptr<!s32i>
 // CIR: cir.func internal private @[[TLS_INT_REF_INIT]]() {
 // CIR:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_int_ref : !cir.ptr<!cir.ptr<!s32i>>
 // CIR:   %[[GET_REF:.*]] = cir.call @_ZTW11tls_int_dyn() : () -> !cir.ptr<!s32i>
@@ -197,7 +197,7 @@ thread_local int tls_int_self_init = tls_int_self_init + get_i();
 // CIR-BEFORE-LPP:    %[[ADD:.*]] = cir.add nsw %[[LOAD_SELF]], %[[CALL]] : !s32i
 // CIR-BEFORE-LPP:    cir.store {{.*}}%[[ADD]], %[[GET_GLOB]] : !s32i, !cir.ptr<!s32i>
 // CIR-BEFORE-LPP:  }
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW17tls_int_self_init", "_ZTH17tls_int_self_init"> @tls_int_self_init = #cir.int<0> : !s32i
+// CIR: cir.global external tls_model = tls_dyn @tls_int_self_init = #cir.int<0> : !s32i
 // CIR: cir.func internal private @[[TLS_INT_SELF_REF_INIT]]() {
 // CIR:   %[[GET_GLOB:.*]] = cir.get_global thread_local @tls_int_self_init : !cir.ptr<!s32i>
 // CIR:   %[[GET_SELF_FROM_WRAPPER:.*]] = cir.call @_ZTW17tls_int_self_init() : () -> !cir.ptr<!s32i>
@@ -224,7 +224,7 @@ thread_local int tls_int_self_init = tls_int_self_init + get_i();
 
 extern thread_local int definitely_inited = 5;
 // CIR-BEFORE-LPP: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW17definitely_inited", "_ZTH17definitely_inited"> @definitely_inited = #cir.int<5> : !s32i
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW17definitely_inited", "_ZTH17definitely_inited"> @definitely_inited = #cir.int<5> : !s32i
+// CIR: cir.global external tls_model = tls_dyn @definitely_inited = #cir.int<5> : !s32i
 
 extern thread_local int definitely_inited_dyn = get_i();
 // CIR-BEFORE-LPP: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW21definitely_inited_dyn", "_ZTH21definitely_inited_dyn"> @definitely_inited_dyn = #cir.int<0> : !s32i ctor {
@@ -232,7 +232,7 @@ extern thread_local int definitely_inited_dyn = get_i();
 // CIR-BEFORE-LPP:   %[[CALL:.*]] = cir.call @_Z5get_iv() : () -> (!s32i {llvm.noundef})
 // CIR-BEFORE-LPP:   cir.store {{.*}}%[[CALL]], %[[GET_GLOB]] : !s32i, !cir.ptr<!s32i>
 // CIR-BEFORE-LPP: }
-// CIR: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW21definitely_inited_dyn", "_ZTH21definitely_inited_dyn"> @definitely_inited_dyn = #cir.int<0> : !s32i
+// CIR: cir.global external tls_model = tls_dyn @definitely_inited_dyn = #cir.int<0> : !s32i
 // CIR: cir.func internal private @[[DEF_INITED_DYN]]() {
 // CIR:   %[[GET_GLOB:.*]] = cir.get_global thread_local @definitely_inited_dyn : !cir.ptr<!s32i>
 // CIR:   %[[CALL:.*]] = cir.call @_Z5get_iv() : () -> (!s32i {llvm.noundef})
@@ -248,7 +248,7 @@ extern thread_local int definitely_inited_dyn = get_i();
 
 extern thread_local int maybe_inited;
 // CIR-BEFORE-LPP: cir.global "private" external tls_model = tls_dyn tls_refs = <"_ZTW12maybe_inited", "_ZTH12maybe_inited"> @maybe_inited : !s32i
-// CIR: cir.global "private" external tls_model = tls_dyn tls_refs = <"_ZTW12maybe_inited", "_ZTH12maybe_inited"> @maybe_inited : !s32i
+// CIR: cir.global "private" external tls_model = tls_dyn @maybe_inited : !s32i
 
 void uses() {
   auto a = tls_int;

diff  --git a/clang/test/CIR/CodeGen/global-tls-templates.cpp b/clang/test/CIR/CodeGen/global-tls-templates.cpp
index 1022d296b0b79..1225b13c0e0a3 100644
--- a/clang/test/CIR/CodeGen/global-tls-templates.cpp
+++ b/clang/test/CIR/CodeGen/global-tls-templates.cpp
@@ -53,7 +53,7 @@ thread_local T tls_templ = {get_i()};
 // CIR: cir.global "private" linkonce_odr comdat("_Z9tls_templIiE") tls_model = tls_dyn @_ZGV9tls_templIiE = #cir.int<0> : !s64i
 
 // Global: int
-// CIR: cir.global linkonce_odr comdat tls_model = tls_dyn tls_refs = <"_ZTW9tls_templIiE", "_ZTH9tls_templIiE", "_ZGV9tls_templIiE"> dynamic_init_guard<"_ZGV9tls_templIiE"> @_Z9tls_templIiE = #cir.int<0> : !s32i
+// CIR: cir.global linkonce_odr comdat tls_model = tls_dyn dynamic_init_guard<"_ZGV9tls_templIiE"> @_Z9tls_templIiE = #cir.int<0> : !s32i
 
 // Init Func: int
 // CIR:  cir.func internal private @[[INT_INIT]]() {
@@ -74,7 +74,7 @@ thread_local T tls_templ = {get_i()};
 
 
 // Global: Ctor/Dotr:
-// CIR: cir.global linkonce_odr comdat tls_model = tls_dyn tls_refs = <"_ZTW9tls_templI8CtorDtorE", "_ZTH9tls_templI8CtorDtorE", "_ZGV9tls_templI8CtorDtorE"> dynamic_init_guard<"_ZGV9tls_templI8CtorDtorE"> @_Z9tls_templI8CtorDtorE = #cir.zero : !rec_CtorDtor
+// CIR: cir.global linkonce_odr comdat tls_model = tls_dyn dynamic_init_guard<"_ZGV9tls_templI8CtorDtorE"> @_Z9tls_templI8CtorDtorE = #cir.zero : !rec_CtorDtor
 
 // Init Func: Ctor/Dtor:
 // CIR: cir.func internal private @[[CTOR_DTOR_INIT]]() {

diff  --git a/clang/test/CIR/CodeGen/tls-model.cpp b/clang/test/CIR/CodeGen/tls-model.cpp
index 20ee77b51eea9..a3109a2f8bb8e 100644
--- a/clang/test/CIR/CodeGen/tls-model.cpp
+++ b/clang/test/CIR/CodeGen/tls-model.cpp
@@ -52,8 +52,8 @@ struct T thread_local t1;
 // CIR-GD-DAG: cir.global external tls_model = tls_dyn @x = #cir.int<0> : !s32i align(4)
 // CIR-GD-DAG: cir.global "private" internal tls_model = tls_dyn dso_local @_ZZ1fvE1y = #cir.int<0> : !s32i align(4)
 // CIR-GD-DAG: cir.global external tls_model = tls_init_exec @z = #cir.int<0> : !s32i align(4)
-// CIR-GD-DAG: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW2s1", "_ZTH2s1"> @s1 = #cir.zero : !rec_S align(1) ast(#cir.var.decl.ast)
-// CIR-GD-DAG: cir.global external tls_model = tls_dyn tls_refs = <"_ZTW2t1", "_ZTH2t1"> @t1 = #cir.zero : !rec_T align(1) ast(#cir.var.decl.ast)
+// CIR-GD-DAG: cir.global external tls_model = tls_dyn @s1 = #cir.zero : !rec_S align(1) ast(#cir.var.decl.ast)
+// CIR-GD-DAG: cir.global external tls_model = tls_dyn @t1 = #cir.zero : !rec_T align(1) ast(#cir.var.decl.ast)
 // CIR-GD-DAG: cir.global internal tls_model = tls_dyn @__tls_guard = #cir.int<0> : !s8i align(1)
 
 // LLVM-GD-DAG: @z1 ={{.*}} global i32 0
@@ -76,8 +76,8 @@ struct T thread_local t1;
 // CIR-LD-DAG: cir.global external tls_model = tls_local_dyn @x = #cir.int<0> : !s32i align(4)
 // CIR-LD-DAG: cir.global "private" internal tls_model = tls_local_dyn dso_local @_ZZ1fvE1y = #cir.int<0> : !s32i align(4)
 // CIR-LD-DAG: cir.global external tls_model = tls_init_exec @z = #cir.int<0> : !s32i align(4)
-// CIR-LD-DAG: cir.global external tls_model = tls_local_dyn tls_refs = <"_ZTW2s1", "_ZTH2s1"> @s1 = #cir.zero : !rec_S align(1) ast(#cir.var.decl.ast)
-// CIR-LD-DAG: cir.global external tls_model = tls_local_dyn tls_refs = <"_ZTW2t1", "_ZTH2t1"> @t1 = #cir.zero : !rec_T align(1) ast(#cir.var.decl.ast)
+// CIR-LD-DAG: cir.global external tls_model = tls_local_dyn @s1 = #cir.zero : !rec_S align(1) ast(#cir.var.decl.ast)
+// CIR-LD-DAG: cir.global external tls_model = tls_local_dyn @t1 = #cir.zero : !rec_T align(1) ast(#cir.var.decl.ast)
 // CIR-LD-DAG: cir.global internal tls_model = tls_local_dyn @__tls_guard = #cir.int<0> : !s8i align(1)
 
 // LLVM-LD-DAG: @z1 ={{.*}} global i32 0
@@ -100,8 +100,8 @@ struct T thread_local t1;
 // CIR-IE-DAG: cir.global external tls_model = tls_init_exec @x = #cir.int<0> : !s32i align(4)
 // CIR-IE-DAG: cir.global "private" internal tls_model = tls_init_exec dso_local @_ZZ1fvE1y = #cir.int<0> : !s32i align(4)
 // CIR-IE-DAG: cir.global external tls_model = tls_init_exec @z = #cir.int<0> : !s32i align(4)
-// CIR-IE-DAG: cir.global external tls_model = tls_init_exec tls_refs = <"_ZTW2s1", "_ZTH2s1"> @s1 = #cir.zero : !rec_S align(1) ast(#cir.var.decl.ast)
-// CIR-IE-DAG: cir.global external tls_model = tls_init_exec tls_refs = <"_ZTW2t1", "_ZTH2t1"> @t1 = #cir.zero : !rec_T align(1) ast(#cir.var.decl.ast)
+// CIR-IE-DAG: cir.global external tls_model = tls_init_exec @s1 = #cir.zero : !rec_S align(1) ast(#cir.var.decl.ast)
+// CIR-IE-DAG: cir.global external tls_model = tls_init_exec @t1 = #cir.zero : !rec_T align(1) ast(#cir.var.decl.ast)
 // CIR-IE-DAG: cir.global internal tls_model = tls_init_exec @__tls_guard = #cir.int<0> : !s8i align(1)
 
 // LLVM-IE-DAG: @z1 ={{.*}} global i32 0
@@ -124,8 +124,8 @@ struct T thread_local t1;
 // CIR-LE-DAG: cir.global external tls_model = tls_local_exec @x = #cir.int<0> : !s32i align(4)
 // CIR-LE-DAG: cir.global "private" internal tls_model = tls_local_exec dso_local @_ZZ1fvE1y = #cir.int<0> : !s32i align(4)
 // CIR-LE-DAG: cir.global external tls_model = tls_init_exec @z = #cir.int<0> : !s32i align(4)
-// CIR-LE-DAG: cir.global external tls_model = tls_local_exec tls_refs = <"_ZTW2s1", "_ZTH2s1"> @s1 = #cir.zero : !rec_S align(1) ast(#cir.var.decl.ast)
-// CIR-LE-DAG: cir.global external tls_model = tls_local_exec tls_refs = <"_ZTW2t1", "_ZTH2t1"> @t1 = #cir.zero : !rec_T align(1) ast(#cir.var.decl.ast)
+// CIR-LE-DAG: cir.global external tls_model = tls_local_exec @s1 = #cir.zero : !rec_S align(1) ast(#cir.var.decl.ast)
+// CIR-LE-DAG: cir.global external tls_model = tls_local_exec @t1 = #cir.zero : !rec_T align(1) ast(#cir.var.decl.ast)
 // CIR-LE-DAG: cir.global internal tls_model = tls_local_exec @__tls_guard = #cir.int<0> : !s8i align(1)
 
 // LLVM-LE-DAG: @z1 ={{.*}} global i32 0

diff  --git a/clang/test/CIR/Transforms/lowering-prepare-tls-rerun.cir b/clang/test/CIR/Transforms/lowering-prepare-tls-rerun.cir
new file mode 100644
index 0000000000000..b69b5f788647b
--- /dev/null
+++ b/clang/test/CIR/Transforms/lowering-prepare-tls-rerun.cir
@@ -0,0 +1,37 @@
+// RUN: cir-opt %s --cir-lowering-prepare -o %t.once.cir
+// RUN: cir-opt %t.once.cir --cir-lowering-prepare -o %t.twice.cir
+// RUN: 
diff  %t.once.cir %t.twice.cir
+// RUN: FileCheck %s --input-file=%t.once.cir --implicit-check-not=tls_refs
+
+// LoweringPrepare consumes 'tls_refs' when it builds the TLS wrapper and init
+// alias, so running it again on its own output builds nothing a second time.
+
+!s32i = !cir.int<s, 32>
+module attributes {cir.default_tls_model = #cir.tls_model<tls_dyn>, cir.triple = "x86_64-unknown-linux-gnu"} {
+  cir.global external tls_model = tls_dyn tls_refs = <"_ZTW2tl", "_ZTH2tl"> @tl = #cir.int<0> : !s32i ctor {
+    %0 = cir.get_global thread_local @tl : !cir.ptr<!s32i>
+    %1 = cir.call @_Z3dynv() : () -> !s32i
+    cir.store align(4) %1, %0 : !s32i, !cir.ptr<!s32i>
+  } align(4)
+  cir.global "private" external tls_model = tls_dyn tls_refs = <"_ZTW3ext", "_ZTH3ext"> @ext : !s32i align(4)
+  cir.func private @_Z3dynv() -> !s32i
+  cir.func @_Z3usev() -> !s32i {
+    %0 = cir.get_global thread_local @tl : !cir.ptr<!s32i>
+    %1 = cir.load align(4) %0 : !cir.ptr<!s32i>, !s32i
+    %2 = cir.get_global thread_local @ext : !cir.ptr<!s32i>
+    %3 = cir.load align(4) %2 : !cir.ptr<!s32i>, !s32i
+    %4 = cir.add nsw %1, %3 : !s32i
+    cir.return %4 : !s32i
+  }
+}
+
+// CHECK: cir.func comdat linkonce_odr private hidden @_ZTW3ext()
+// CHECK: cir.func extern_weak private @_ZTH3ext()
+// CHECK: cir.func comdat weak_odr private hidden @_ZTW2tl()
+// CHECK: cir.func @_ZTH2tl() alias(@__tls_init)
+// CHECK: cir.func internal private @__tls_init()
+// CHECK: cir.global external tls_model = tls_dyn @tl = #cir.int<0> : !s32i align(4)
+// CHECK: cir.global "private" external tls_model = tls_dyn @ext : !s32i align(4)
+// CHECK: cir.func @_Z3usev()
+// CHECK:   cir.call @_ZTW2tl()
+// CHECK:   cir.call @_ZTW3ext()


        


More information about the cfe-commits mailing list