diff options
Diffstat (limited to 'lib/CodeGen')
-rw-r--r-- | lib/CodeGen/CGDeclCXX.cpp | 10 | ||||
-rw-r--r-- | lib/CodeGen/ItaniumCXXABI.cpp | 7 |
2 files changed, 15 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()); |