decl.c (grokdeclarator): Error_mark_node in, error_mark_node out.

gcc/cp:
	* decl.c (grokdeclarator): Error_mark_node in, error_mark_node out.

gcc/testsuite/g++.old-deja/g++.oliva:
	* template1.C (bar): Remove xfail marker.

From-SVN: r67465

gcc/cp/ChangeLog

+2003-06-04  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* decl.c (grokdeclarator): Error_mark_node in, error_mark_node out.
+
 2003-06-04  Andreas Jaeger  <aj@suse.de>
 
 	* g++spec.c (lang_specific_driver): Remove ALT_LIBM usage.

gcc/cp/decl.c

@@ -10525,7 +10525,9 @@ grokdeclarator (tree declarator,
 
       if (type == error_mark_node)
 	{
-	  if (TREE_CODE (declarator) == SCOPE_REF)
+	  if (declarator == error_mark_node)
+	    return error_mark_node;
+	  else if (TREE_CODE (declarator) == SCOPE_REF)
 	    declarator = TREE_OPERAND (declarator, 1);
 	  else
 	    declarator = TREE_OPERAND (declarator, 0);

gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog

+2003-06-04  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* template1.C (bar): Remove xfail marker.
+
 2002-07-06  Alexandre Oliva  <aoliva@redhat.com>
 
 	* linkage1.C, linkage1-main.cc: New test.

gcc/testsuite/g++.old-deja/g++.oliva/template1.C

@@ -11,5 +11,5 @@ template<int P = 0> struct foo {
 };
 
 void bar() {
-  foo<>::bar(0); // { dg-error "" "" { xfail *-*-* } } instantiated from here
+  foo<>::bar(0); // { dg-error "" "" } instantiated from here
 }