commit 95b83e917e40bafd7e5bf0a4cdc592745b3b1fcc
author Richard Smith <richard-llvm@metafoo.co.uk> Thu Jul 10 20:53:43 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu Jul 10 20:53:43 2014 +0000
tree 1986b9372b0df622f7c861e17b6ce74c887aa0db
parent 31fd9d09b2ac07e0bae0a81d387db89d5090769d

PR20256: don't accidentally instantiate non-dependent default-initialization as
value-initialization.

llvm-svn: 212764

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index c655d3f..accec95 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -3679,8 +3679,9 @@
       bool TypeMayContainAuto = true;
       Expr *InitExpr = Init.get();
 
-      if (Var->hasAttr<DLLImportAttr>() && InitExpr &&
-          !InitExpr->isConstantInitializer(getASTContext(), false)) {
+      if (Var->hasAttr<DLLImportAttr>() &&
+          (!InitExpr ||
+           !InitExpr->isConstantInitializer(getASTContext(), false))) {
         // Do not dynamically initialize dllimport variables.
       } else if (InitExpr) {
         bool DirectInit = OldVar->isDirectInit();