commit f580dd98cba2aeda6c59d69f30bd56bc7cc4b41b
author David Majnemer <david.majnemer@gmail.com> Mon Jul 11 05:59:24 2016 +0000
committer David Majnemer <david.majnemer@gmail.com> Mon Jul 11 05:59:24 2016 +0000
tree 3cef2a17aa61161355ccf7c6065355f6ed6089c7
parent 7ee070e7bcd0f518bc309bc7953c08937ce1c704

[Sema] Disallow __make_integer_seq from showing up in __make_integer_seq

We hit over stringent asserts when trying to diagnose.  Loosen them as
appropriate.

This fixes PR28494.

llvm-svn: 275047

clang/lib/Sema/SemaTemplate.cpp

diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index 862447b..c1b6b5e 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -5378,11 +5378,13 @@
   if (!isa<ClassTemplateDecl>(Template) &&
       !isa<TemplateTemplateParmDecl>(Template) &&
       !isa<TypeAliasTemplateDecl>(Template)) {
-    assert(isa<FunctionTemplateDecl>(Template) &&
-           "Only function templates are possible here");
+    assert((isa<FunctionTemplateDecl>(Template) ||
+            isa<BuiltinTemplateDecl>(Template)) &&
+           "Only function or builtin templates are possible here");
     Diag(Arg.getLocation(), diag::err_template_arg_not_valid_template);
-    Diag(Template->getLocation(), diag::note_template_arg_refers_here_func)
-      << Template;
+    if (isa<FunctionTemplateDecl>(Template))
+      Diag(Template->getLocation(), diag::note_template_arg_refers_here_func)
+          << Template;
   }
 
   TemplateParameterList *Params = Param->getTemplateParameters();

clang/test/SemaCXX/make_integer_seq.cpp

diff --git a/clang/test/SemaCXX/make_integer_seq.cpp b/clang/test/SemaCXX/make_integer_seq.cpp
index 4e15414..0cab0cf 100644
--- a/clang/test/SemaCXX/make_integer_seq.cpp
+++ b/clang/test/SemaCXX/make_integer_seq.cpp
@@ -47,3 +47,7 @@
 
 template <typename T, T N> void f() {}
 __make_integer_seq<f, int, 0> x; // expected-error{{template template parameter must be a class template or type alias template}}
+
+__make_integer_seq<__make_integer_seq, int, 10> PR28494; // expected-error{{does not refer to a class or alias template, or template template parameter}} expected-error{{different template parameters}}
+// expected-note@make_integer_seq.cpp:* {{template parameter has a different kind}}
+// expected-note@make_integer_seq.cpp:* {{previous template template parameter is here}}