PR c++/88184 - ICE when treating name as template-name.

	* pt.c (lookup_template_function): Always build the TEMPLATE_ID_EXPR
	with unknown_type_node.

	* g++.dg/cpp2a/fn-template17.C: New test.
	* g++.dg/cpp2a/fn-template18.C: New test.

From-SVN: r266793

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 866fd33e6bd009af64a606681762a9a719bb1705..d43d6132d3401b409cf5158f2a8fdbe83bc8c458 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-04  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/88184 - ICE when treating name as template-name.
+       * pt.c (lookup_template_function): Always build the TEMPLATE_ID_EXPR
+       with unknown_type_node.
+
 2018-12-04  Julian Brown  <julian@codesourcery.com>
 
        * parser.c (cp_parser_oacc_wait_list): Fix error message and avoid

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index a0d899f594b6cffa6462979d0852af7d9d8484ab..78addc6c1c2e2566d160e9cac3c4490860e2b8f9 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9068,8 +9068,6 @@ add_pending_template (tree d)
 tree
 lookup_template_function (tree fns, tree arglist)
 {
-  tree type;
-
   if (fns == error_mark_node || arglist == error_mark_node)
     return error_mark_node;
 
@@ -9090,11 +9088,7 @@ lookup_template_function (tree fns, tree arglist)
       return fns;
     }
 
-  type = TREE_TYPE (fns);
-  if (TREE_CODE (fns) == OVERLOAD || !type)
-    type = unknown_type_node;
-
-  return build2 (TEMPLATE_ID_EXPR, type, fns, arglist);
+  return build2 (TEMPLATE_ID_EXPR, unknown_type_node, fns, arglist);
 }
 
 /* Within the scope of a template class S<T>, the name S gets bound

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 558f0deed0f97ff66ed1fa9654a7c322501812f5..887705e2503f499b45358397c225bc4863e83afe 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-04  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/88184 - ICE when treating name as template-name.
+       * g++.dg/cpp2a/fn-template17.C: New test.
+       * g++.dg/cpp2a/fn-template18.C: New test.
+
 2018-12-04  David Edelsohn  <dje.gcc@gmail.com>
 
        * gcc.dg/live-patching-2.c: Require LTO.

diff --git a/gcc/testsuite/g++.dg/cpp2a/fn-template17.C b/gcc/testsuite/g++.dg/cpp2a/fn-template17.C
new file mode 100644 (file)
index 0000000..f0d2410
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/fn-template17.C
@@ -0,0 +1,21 @@
+// PR c++/88184
+// { dg-do compile }
+// { dg-options "-std=c++2a -fchecking=2" }
+
+namespace A
+{
+  void f ();
+}
+
+using A::f;
+
+template <typename T> void g ()
+{
+  f<T> (); // { dg-error "no matching function for call" }
+}
+
+void
+fn ()
+{
+  g<int>();
+}

diff --git a/gcc/testsuite/g++.dg/cpp2a/fn-template18.C b/gcc/testsuite/g++.dg/cpp2a/fn-template18.C
new file mode 100644 (file)
index 0000000..7fe5e89
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/fn-template18.C
@@ -0,0 +1,23 @@
+// PR c++/88184
+// { dg-do compile }
+// { dg-options "-std=c++2a -fchecking=2" }
+
+namespace A
+{
+  void f ();
+  void f (int);
+  void f (int, int);
+}
+
+using A::f;
+
+template <typename T> void g ()
+{
+  f<T> (); // { dg-error "no matching function for call" }
+}
+
+void
+fn ()
+{
+  g<int>();
+}