diff options
| -rw-r--r-- | clang/lib/CodeGen/CGDeclCXX.cpp | 8 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/cxx1y-variable-template.cpp | 17 |
2 files changed, 24 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp index ce0163723c4..199e0ac99e8 100644 --- a/clang/lib/CodeGen/CGDeclCXX.cpp +++ b/clang/lib/CodeGen/CGDeclCXX.cpp @@ -630,7 +630,13 @@ void CodeGenFunction::GenerateCXXGlobalVarDeclInitFunc(llvm::Function *Fn, // Use guarded initialization if the global variable is weak. This // occurs for, e.g., instantiated static data members and // definitions explicitly marked weak. - if (Addr->hasWeakLinkage() || Addr->hasLinkOnceLinkage()) { + // + // Also use guarded initialization for a variable with dynamic TLS and + // unordered initialization. (If the initialization is ordered, the ABI + // layer will guard the whole-TU initialization for us.) + if (Addr->hasWeakLinkage() || Addr->hasLinkOnceLinkage() || + (D->getTLSKind() == VarDecl::TLS_Dynamic && + isTemplateInstantiation(D->getTemplateSpecializationKind()))) { EmitCXXGuardedInit(*D, Addr, PerformInit); } else { EmitCXXGlobalVarDeclInit(*D, Addr, PerformInit); diff --git a/clang/test/CodeGenCXX/cxx1y-variable-template.cpp b/clang/test/CodeGenCXX/cxx1y-variable-template.cpp index dd8f28e4299..51d1b54b37a 100644 --- a/clang/test/CodeGenCXX/cxx1y-variable-template.cpp +++ b/clang/test/CodeGenCXX/cxx1y-variable-template.cpp @@ -27,4 +27,21 @@ int *p = &n<0>; // CHECK: @_ZN5OuterIA100_cE5InnerIA20_cE3arrIA3_cEE = linkonce_odr global [123 x i32] zeroinitializer // CHECK: @_ZGVN5OuterIA100_cE5InnerIA20_cE3arrIA3_cEE = linkonce_odr global +// CHECK: @_ZTHN7PR4211112_GLOBAL__N_11nILi0EEE = internal alias {{.*}} @[[PR42111_CTOR:.*]] + // CHECK: call {{.*}}@_Z8init_arrv + +// Ensure that we use guarded initialization for an instantiated thread_local +// variable with internal linkage. +namespace PR42111 { + int f(); + namespace { template <int = 0> thread_local int n = f(); } + // CHECK: define {{.*}}@[[PR42111_CTOR]]( + // CHECK: load {{.*}} @_ZGVN7PR4211112_GLOBAL__N_11nILi0EEE + // CHECK: icmp eq i8 {{.*}}, 0 + // CHECK: br i1 + // CHECK: call i32 @_ZN7PR421111fEv( + // CHECK: store i32 {{.*}}, i32* @_ZN7PR4211112_GLOBAL__N_11nILi0EEE + // CHECK: store i8 1, i8* @_ZGVN7PR4211112_GLOBAL__N_11nILi0EEE + int g() { return n<> + n<>; } +} |
