re PR c++/25300 (ICE with g++.dg/template/inherit.C)

	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.

From-SVN: r108413

gcc/cp/ChangeLog

+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 

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;

gcc/testsuite/ChangeLog

+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

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" "" }
 }