commit 70a01898008a90007866f15c4d9d53ba00b0d203
author Eli Friedman <eli.friedman@gmail.com> Tue Nov 06 23:56:42 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Tue Nov 06 23:56:42 2012 +0000
tree bd6d9b19b02bdd507aacf06973c863dda7963ae9
parent 9e60371ba07faa2f173ab614ceaad0332518c8dc

Fix assertion failure with auto and nested initializer list; PR14272.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167506 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaTemplateDeduction.cpp

diff --git a/lib/Sema/SemaTemplateDeduction.cpp b/lib/Sema/SemaTemplateDeduction.cpp
index 6b58087..98e22c0 100644
--- a/lib/Sema/SemaTemplateDeduction.cpp
+++ b/lib/Sema/SemaTemplateDeduction.cpp
@@ -3649,10 +3649,11 @@
       return DAR_Failed;
   }
 
-  QualType DeducedType = Deduced[0].getAsType();
-  if (DeducedType.isNull())
+  if (Deduced[0].getKind() != TemplateArgument::Type)
     return DAR_Failed;
 
+  QualType DeducedType = Deduced[0].getAsType();
+
   if (InitList) {
     DeducedType = BuildStdInitializerList(DeducedType, Loc);
     if (DeducedType.isNull())