diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-10-26 22:47:47 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-10-26 22:47:47 +0000 |
| commit | 92d835a86ac334768d0b75936201e4fea3941c1f (patch) | |
| tree | 075b0167ae03efb9e84a9c57a4c3a8915ea97b45 | |
| parent | 789a1597250e57d7f35f253467165913c68979ad (diff) | |
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
| -rw-r--r-- | lib/CodeGen/CGDeclCXX.cpp | 10 | ||||
| -rw-r--r-- | lib/CodeGen/ItaniumCXXABI.cpp | 7 | ||||
| -rw-r--r-- | test/CodeGenCXX/specialized-static-data-mem-init.cpp | 29 |
3 files changed, 44 insertions, 2 deletions
diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp index 1b42f6189e..6d0806424d 100644 --- 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 4d0e05da4a..b6c40b64db 100644 --- 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 index 0000000000..8f5765bcbb --- /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(); +} + |