commit 93ee9caaede478563bed7d29c7331552f74c3508
author Richard Smith <richard-llvm@metafoo.co.uk> Wed Jan 10 23:08:26 2018 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed Jan 10 23:08:26 2018 +0000
tree ea07994ab16660e05e49fd5a99767fcda36fd7ee
parent 1f74a24ac05ce493a46bdadec4d7c089398214b5

In C++17, when instantiating an out-of-line definition of an inline static data
member, don't forget to instantiate the initializer too.

llvm-svn: 322236

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 0d45835..b8b7440 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -4151,7 +4151,8 @@
   // it right away if the type contains 'auto'.
   if ((!isa<VarTemplateSpecializationDecl>(NewVar) &&
        !InstantiatingVarTemplate &&
-       !(OldVar->isInline() && OldVar->isThisDeclarationADefinition())) ||
+       !(OldVar->isInline() && OldVar->isThisDeclarationADefinition() &&
+         !NewVar->isThisDeclarationADefinition())) ||
       NewVar->getType()->isUndeducedType())
     InstantiateVariableInitializer(NewVar, OldVar, TemplateArgs);