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/CGDeclCXX.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/CGDeclCXX.cpp')
| -rw-r--r-- | lib/CodeGen/CGDeclCXX.cpp | 10 |
1 files changed, 9 insertions, 1 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(); } |