From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 12 Dec 2005 16:29:44 +0000 (+0000)
Subject: 	PR c++/25300
X-Git-Tag: upstream/4.9.2~57064
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1b79e36b42dd9a9f972966ba548ef0b8278ee2a;p=platform%2Fupstream%2Flinaro-gcc.git

	PR c++/25300
	* tree.c (build_qualified_name): Return error_mark_node for
	erroneous input.
	PR c++/25300
	* g++.dg/template/inherit.C: Do not use a generic error message.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108413 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b3bad79..700b992 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-12  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/25300
+	* tree.c (build_qualified_name): Return error_mark_node for
+	erroneous input.
+
 2005-12-10  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/25337 
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 15ee56c..4340c69 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -817,6 +817,10 @@ tree
 build_qualified_name (tree type, tree scope, tree name, bool template_p)
 {
   tree t;
+  if (type == error_mark_node
+      || scope == error_mark_node
+      || name == error_mark_node)
+    return error_mark_node;
   t = build2 (SCOPE_REF, type, scope, name);
   QUALIFIED_NAME_IS_TEMPLATE (t) = template_p;
   return t;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bdade3e..6e5aad0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-12  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/25300
+	* g++.dg/template/inherit.C: Do not use a generic error message.
+
 2005-12-12  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR libobjc/25354
diff --git a/gcc/testsuite/g++.dg/template/inherit.C b/gcc/testsuite/g++.dg/template/inherit.C
index dbff7e1..bc20345 100644
--- a/gcc/testsuite/g++.dg/template/inherit.C
+++ b/gcc/testsuite/g++.dg/template/inherit.C
@@ -9,5 +9,5 @@ struct Z : X<int> { };
 int main()
 {
   Z z;
-  z.X::f();                     // { dg-error ".*" "" }
+  z.X::f();                     // { dg-error "template parameters" "" }
 }