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 /lib/CodeGen/ItaniumCXXABI.cpp | |
| 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
Diffstat (limited to 'lib/CodeGen/ItaniumCXXABI.cpp')
| -rw-r--r-- | lib/CodeGen/ItaniumCXXABI.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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()); |