aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ"orn Rennecke <joern.rennecke@superh.com>2003-06-04 22:00:22 +0000
committerJoern Rennecke <amylaar@gcc.gnu.org>2003-06-04 23:00:22 +0100
commit88d5a16e0b42cb6871bf30e770ee75feb0da967b (patch)
tree510016d2c66c5b27c6f8153317b955dceb2c7c2e
parentc53dddc2322f42332c78dec0a2eeedec6f5f6b0c (diff)
downloadgcc-88d5a16e0b42cb6871bf30e770ee75feb0da967b.zip
gcc-88d5a16e0b42cb6871bf30e770ee75feb0da967b.tar.gz
gcc-88d5a16e0b42cb6871bf30e770ee75feb0da967b.tar.bz2
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
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/decl.c4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.oliva/template1.C2
4 files changed, 12 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index da0f5b3..2e735f3 100644
--- 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 705f5a0..d269140 100644
--- 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 c885701..cb7d567 100644
--- 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 f8c9b1d..133899e 100644
--- 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
}