commit 365efd62a1982bbd38680e23562de09e12c96cbb
author Nick Lewycky <nicholas@mxc.ca> Thu Jul 07 02:20:13 2011 +0000
committer Nick Lewycky <nicholas@mxc.ca> Thu Jul 07 02:20:13 2011 +0000
tree 01467eb1fcf748c44c41c6eb131a583b7b912c7a
parent 644247c1dc56106a06afbf8ac25fa4e07f46dd88

In an in-class initialization, defer checks for value-dependent initialization
expressions.

llvm-svn: 134583

clang/lib/Sema/SemaTemplateInstantiate.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp
index 675cef7..edafb00 100644
--- a/clang/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp
@@ -1812,9 +1812,11 @@
     ExprResult NewInit = SubstExpr(OldInit, TemplateArgs);
 
     // If the initialization is no longer dependent, check it now.
-    if ((OldField->getType()->isDependentType() || OldInit->isTypeDependent())
-        && !NewField->getType()->isDependentType()
-        && !NewInit.get()->isTypeDependent()) {
+    if ((OldField->getType()->isDependentType() || OldInit->isTypeDependent() ||
+         OldInit->isValueDependent()) &&
+        !NewField->getType()->isDependentType() &&
+        !NewInit.get()->isTypeDependent() &&
+        !NewInit.get()->isValueDependent()) {
       // FIXME: handle list-initialization
       SourceLocation EqualLoc = NewField->getLocation();
       NewInit = PerformCopyInitialization(