commit 52e624f3ecbe1e44d92e28b2b7506796974db697
author Richard Smith <richard-llvm@metafoo.co.uk> Wed Dec 21 21:42:57 2016 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed Dec 21 21:42:57 2016 +0000
tree 5b94a5824912dce8c4b5ad2a877df027f34205f1
parent 6bb0e39321329809c591bb433583f3969b2b08af

Perform type-checking for a converted constant expression in a template
argument even if the expression is value-dependent (we need to suppress the
final portion of the narrowing check, but the rest of the checking can still be
done eagerly).

This affects template template argument validity and partial ordering under
p0522r0.

llvm-svn: 290276

clang/lib/Sema/SemaInit.cpp

diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 5bb5518..8ab14b2 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -6816,7 +6816,7 @@
       CurInit = CurInitExprRes;
 
       if (Step->Kind == SK_ConversionSequenceNoNarrowing &&
-          S.getLangOpts().CPlusPlus && !CurInit.get()->isValueDependent())
+          S.getLangOpts().CPlusPlus)
         DiagnoseNarrowingInInitList(S, *Step->ICS, SourceType, Entity.getType(),
                                     CurInit.get());
 
@@ -8070,6 +8070,7 @@
   switch (SCS->getNarrowingKind(S.Context, PostInit, ConstantValue,
                                 ConstantType)) {
   case NK_Not_Narrowing:
+  case NK_Dependent_Narrowing:
     // No narrowing occurred.
     return;