From 6086f09349349ba187832a2b2495ea453c2ec6cf Mon Sep 17 00:00:00 2001
From: lmillward <lmillward@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Aug 2006 17:27:48 +0000
Subject: [PATCH] PR c++/26269 * decl.c (duplicate_decls):
Return early if either newdecl or olddecl is error_mark_node.
* g++.dg/other/error14.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116301 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/decl.c | 2 +-
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/other/error14.C | 7 +++++++
4 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/g++.dg/other/error14.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6fd125ab1d48..366aa69f8589 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-21 Lee Millward <lee.millward@codesourcery.com>
+
+ PR c++/26269
+ * decl.c (duplicate_decls): Return early if either
+ newdecl or olddecl is error_mark_node.
+
2006-08-20 Mark Mitchell <mark@codesourcery.com>
PR c++/28341
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index a8ec398e1ffa..b67aea76a785 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -1124,7 +1124,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
about the same declaration, so just pretend the types match here. */
if (TREE_TYPE (newdecl) == error_mark_node
|| TREE_TYPE (olddecl) == error_mark_node)
- types_match = 1;
+ return error_mark_node.
if (DECL_P (olddecl)
&& TREE_CODE (newdecl) == FUNCTION_DECL
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d6e011ce9b47..d61c5ae9fd91 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-21 Lee Millward <lee.millward@codesourcery.com>
+
+ PR c++/26269
+ * g++.dg/other/error14.C: New test.
+
2006-08-21 Olivier Hainque <hainque@adacore.com>
* gnat.dg/self_aggregate_with_zeros.adb: New test.
diff --git a/gcc/testsuite/g++.dg/other/error14.C b/gcc/testsuite/g++.dg/other/error14.C
new file mode 100644
index 000000000000..b3c930188e39
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/error14.C
@@ -0,0 +1,7 @@
+//PR c++/26269
+
+void foo()
+{
+ i; // { dg-error "not declared in this scope" }
+ int i;
+}
--
GitLab