diff options
| author | Lee Millward <lee.millward@codesourcery.com> | 2006-08-21 17:27:48 +0000 |
|---|---|---|
| committer | Lee Millward <lmillward@gcc.gnu.org> | 2006-08-21 17:27:48 +0000 |
| commit | 18ff35c669b4721876e3883e8c97b22683239a2e (patch) | |
| tree | 39be1de62de3156e42b2cb895b7f68be5008a344 | |
| parent | 85d89e767bb134b00064ee219f63860d06444913 (diff) | |
| download | gcc-18ff35c669b4721876e3883e8c97b22683239a2e.zip gcc-18ff35c669b4721876e3883e8c97b22683239a2e.tar.gz gcc-18ff35c669b4721876e3883e8c97b22683239a2e.tar.bz2 | |
re PR c++/26269 (Declaring a variable too late yields bogus error message)
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.
From-SVN: r116301
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/error14.C | 7 |
4 files changed, 19 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6fd125a..366aa69 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 a8ec398..b67aea7 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 d6e011c..d61c5ae 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 0000000..b3c9301 --- /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; +} |