From: Jason Merrill <jason@redhat.com>
Date: Mon, 7 Dec 2015 04:35:02 +0000 (-0500)
Subject: Fix crash70.C with -std=c++1z.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ea106d85b5e2e7278472070b45d22f892f1e1d3;p=gcc.git

Fix crash70.C with -std=c++1z.

	* semantics.c (finish_qualified_id_expr): Handle
	UNBOUND_CLASS_TEMPLATE.

From-SVN: r231352
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1fdbe05c5f7..9a8a2b58b04 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2015-12-06  Jason Merrill  <jason@redhat.com>
 
+	* semantics.c (finish_qualified_id_expr): Handle
+	UNBOUND_CLASS_TEMPLATE.
+
 	* parser.c (cp_parser_template_argument): Handle references in
 	C++1z mode.
 	* constexpr.c (potential_constant_expression_1): Don't error about
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 82f7d3a2c5e..80d1b10ddad 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1929,7 +1929,17 @@ finish_qualified_id_expr (tree qualifying_class,
     return error_mark_node;
 
   if (template_p)
-    check_template_keyword (expr);
+    {
+      if (TREE_CODE (expr) == UNBOUND_CLASS_TEMPLATE)
+	/* cp_parser_lookup_name thought we were looking for a type,
+	   but we're actually looking for a declaration.  */
+	expr = build_qualified_name (/*type*/NULL_TREE,
+				     TYPE_CONTEXT (expr),
+				     TYPE_IDENTIFIER (expr),
+				     /*template_p*/true);
+      else
+	check_template_keyword (expr);
+    }
 
   /* If EXPR occurs as the operand of '&', use special handling that
      permits a pointer-to-member.  */
diff --git a/gcc/testsuite/g++.dg/template/crash70.C b/gcc/testsuite/g++.dg/template/crash70.C
index 742f77b2225..9ccadfb6fad 100644
--- a/gcc/testsuite/g++.dg/template/crash70.C
+++ b/gcc/testsuite/g++.dg/template/crash70.C
@@ -2,6 +2,6 @@
 
 template<int> struct A;
 
-template<typename T> void foo (A<&T::template i>); // { dg-error "not a template" }
+template<typename T> void foo (A<&T::template i>);
 
 template void foo<A<0> > (A<0>); // { dg-error "does not match" }