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();
 }