Patch to provide guard when initializing instances

of static data member of a class template.
Fixes //rdar :// 8562966 and pr8409.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@117410 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp
index 1b42f6189e9b9e3c29e6651adfa7b44acfe48ccd..6d0806424dd5fefc069e1dedc5cdd25164118df9 100644 (file)
--- a/lib/CodeGen/CGDeclCXX.cpp
+++ b/lib/CodeGen/CGDeclCXX.cpp
@@ -253,7 +253,15 @@ void CodeGenFunction::GenerateCXXGlobalVarDeclInitFunc(llvm::Function *Fn,
                 SourceLocation());
 
   llvm::Constant *DeclPtr = CGM.GetAddrOfGlobalVar(D);
-  EmitCXXGlobalVarDeclInit(*D, DeclPtr);
+  if (D->isStaticDataMember() &&
+      D->getInstantiatedFromStaticDataMember() && D->getInit()){
+    llvm::GlobalVariable *GV = dyn_cast<llvm::GlobalVariable>(DeclPtr);
+    assert(GV && "GenerateCXXGlobalVarDeclInitFunc - GV is null");
+    GV->setConstant(false);
+    EmitCXXStaticLocalInit(*D, GV);
+  }
+  else
+    EmitCXXGlobalVarDeclInit(*D, DeclPtr);
 
   FinishFunction();
 }

diff --git a/lib/CodeGen/ItaniumCXXABI.cpp b/lib/CodeGen/ItaniumCXXABI.cpp
index 4d0e05da4ae6e00a40b408821d48d14599c21bc1..b6c40b64db201a36b37b74fbc273867bef502918 100644 (file)
--- a/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/lib/CodeGen/ItaniumCXXABI.cpp
@@ -1092,9 +1092,14 @@ void ItaniumCXXABI::EmitStaticLocalInit(CodeGenFunction &CGF,
   // Create the guard variable.
   llvm::SmallString<256> GuardVName;
   getMangleContext().mangleItaniumGuardVariable(&D, GuardVName);
+  llvm::GlobalValue::LinkageTypes Linkage = GV->getLinkage();
+  if (D.isStaticDataMember() &&
+      D.getInstantiatedFromStaticDataMember())
+    Linkage = llvm::GlobalVariable::WeakAnyLinkage;
+  
   llvm::GlobalVariable *GuardVariable =
     new llvm::GlobalVariable(CGM.getModule(), GuardTy,
-                             false, GV->getLinkage(),
+                             false, Linkage,
                              llvm::ConstantInt::get(GuardTy, 0),
                              GuardVName.str());
 

diff --git a/test/CodeGenCXX/specialized-static-data-mem-init.cpp b/test/CodeGenCXX/specialized-static-data-mem-init.cpp
new file mode 100644 (file)
index 0000000..8f5765b
--- /dev/null
+++ b/test/CodeGenCXX/specialized-static-data-mem-init.cpp
@@ -0,0 +1,29 @@
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
+// rdar: // 8562966
+// pr8409
+
+// CHECK: @_ZN1CIiE11needs_guardE = weak global
+// CHECK: @_ZGVN1CIiE11needs_guardE = weak global
+
+struct K
+{
+  K();
+  K(const K &);
+  ~K();
+  void PrintNumK();
+};
+
+template<typename T>
+struct C
+{
+  void Go() { needs_guard.PrintNumK(); }
+  static K needs_guard;
+};
+
+template<typename T> K C<T>::needs_guard;
+
+void F()
+{
+  C<int>().Go();
+}
+