From 22235619ba63b4a17f2b208958f467233c84bdb7 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Sat, 24 Jun 2017 19:31:24 +0000
Subject: [PATCH] re PR c++/62315 (do not print typename in diagnostic if the
 original code does not have it)

/cp
2017-06-24  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/62315
	* parser.c (cp_parser_diagnose_invalid_type_name): Don't print
	'typename' in error messages about missing 'typename'.

/testsuite
2017-06-24  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/62315
	* g++.dg/parse/typedef2.C: Specify a dg-error string.

From-SVN: r249626
---
 gcc/cp/ChangeLog                      |  6 ++++++
 gcc/cp/parser.c                       | 18 +++++++++++++++---
 gcc/testsuite/ChangeLog               |  5 +++++
 gcc/testsuite/g++.dg/parse/typedef2.C |  3 +--
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2d590a5d66f..a06de8ba8c7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-24  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/62315
+	* parser.c (cp_parser_diagnose_invalid_type_name): Don't print
+	'typename' in error messages about missing 'typename'.
+
 2017-06-23  Jason Merrill  <jason@redhat.com>
 
 	PR c++/79056 - C++17 ICE with invalid template syntax.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 97cd9237bf2..634047e5d05 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3272,9 +3272,21 @@ cp_parser_diagnose_invalid_type_name (cp_parser *parser, tree id,
 	}
       else if (TYPE_P (parser->scope)
 	       && dependent_scope_p (parser->scope))
-	error_at (location, "need %<typename%> before %<%T::%E%> because "
-		  "%qT is a dependent scope",
-		  parser->scope, id, parser->scope);
+	{
+	  if (TREE_CODE (parser->scope) == TYPENAME_TYPE)
+	    error_at (location,
+		      "need %<typename%> before %<%T::%D::%E%> because "
+		      "%<%T::%D%> is a dependent scope",
+		      TYPE_CONTEXT (parser->scope),
+		      TYPENAME_TYPE_FULLNAME (parser->scope),
+		      id,
+		      TYPE_CONTEXT (parser->scope),
+		      TYPENAME_TYPE_FULLNAME (parser->scope));
+	  else
+	    error_at (location, "need %<typename%> before %<%T::%E%> because "
+		      "%qT is a dependent scope",
+		      parser->scope, id, parser->scope);
+	}
       else if (TYPE_P (parser->scope))
 	{
 	  if (!COMPLETE_TYPE_P (parser->scope))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eefa2c47715..ad5ccb7dc64 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-24  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/62315
+	* g++.dg/parse/typedef2.C: Specify a dg-error string.
+
 2017-06-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
         PR fortran/52473
diff --git a/gcc/testsuite/g++.dg/parse/typedef2.C b/gcc/testsuite/g++.dg/parse/typedef2.C
index 3ae347d7542..1cc1ea0d58f 100644
--- a/gcc/testsuite/g++.dg/parse/typedef2.C
+++ b/gcc/testsuite/g++.dg/parse/typedef2.C
@@ -1,3 +1,2 @@
 template <typename T> struct B { typedef typename T::X X; };
-template <typename T> struct A { typedef B<T>::X::Y Z; }; // { dg-error "" }
- 
+template <typename T> struct A { typedef B<T>::X::Y Z; }; // { dg-error "before 'B<T>::X::Y' because 'B<T>::X'" }
-- 
2.30.2