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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index da0f5b3d5f5f4c84ed4eec1b42384a7c5de728ec..2e735f3c013944af85d215cfeecbf56acca3cd4c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 705f5a07cd9950d36c9e177518dc5d3b7b693e1a..d2691409d334a643659548115f4761fde906159f 100644 (file)
--- a/gcc/cp/decl.c
+++ b/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);

diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
index c885701b00c2fc23263596fb5060e72b49ba557b..cb7d567f659fca658282c61f56db218b17c8c99d 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/template1.C b/gcc/testsuite/g++.old-deja/g++.oliva/template1.C
index f8c9b1dae53916f2d5ede9b404716c775f9d3a53..133899e55e8e49c22b84f9c0afea8b9caa925f92 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.oliva/template1.C
+++ b/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
 }