Don't dynamically initialize dllimport vars (PR19933)

They should be initialized when they're exported.

Differential Revision: http://reviews.llvm.org/D4020

llvm-svn: 210217

1 files changed, 6 insertions, 0 deletions

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 5635bea63d9..2fa28a33a10 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -3671,6 +3671,12 @@ void Sema::InstantiateVariableInitializer(
     // We already have an initializer in the class.
     return;
 
+  if (Var->hasAttr<DLLImportAttr>() &&
+      !(OldVar->getInit() && OldVar->checkInitIsICE())) {
+    // Do not dynamically initialize dllimport variables.
+    return;
+  }
+
   if (OldVar->getInit()) {
     if (Var->isStaticDataMember() && !OldVar->isOutOfLine())
       PushExpressionEvaluationContext(Sema::ConstantEvaluated, OldVar);