diff options
| author | Roger Sayle <sayle@gcc.gnu.org> | 2004-05-22 13:56:19 +0000 |
|---|---|---|
| committer | Roger Sayle <sayle@gcc.gnu.org> | 2004-05-22 13:56:19 +0000 |
| commit | ae5cbc332f60a4f9bcca56c4739410c9b2d3abf9 (patch) | |
| tree | f4a140dd0b5dd33ca49fc912aca01dccd68a2b20 /gcc | |
| parent | b7e6a6b3f511cc8aabb80a4460c417fcac90c2e7 (diff) | |
| download | gcc-ae5cbc332f60a4f9bcca56c4739410c9b2d3abf9.zip gcc-ae5cbc332f60a4f9bcca56c4739410c9b2d3abf9.tar.gz gcc-ae5cbc332f60a4f9bcca56c4739410c9b2d3abf9.tar.bz2 | |
name-lookup.c (check_for_out_of_scope_variable): Avoid ICE by returning when TREE_TYPE is error_mark_node.
* name-lookup.c (check_for_out_of_scope_variable): Avoid ICE by
returning when TREE_TYPE is error_mark_node.
* typeck.c (require_complete_type): Return error_mark_node if
value's type is an error_mark_node.
* g++.dg/lookup/forscope2.C: New test case.
From-SVN: r82133
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 4 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/forscope2.C | 9 |
5 files changed, 28 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e4836fd..03cc5a8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2004-05-22 Roger Sayle <roger@eyesopen.com> + + * name-lookup.c (check_for_out_of_scope_variable): Avoid ICE by + returning when TREE_TYPE is error_mark_node. + * typeck.c (require_complete_type): Return error_mark_node if + value's type is an error_mark_node. + 2005-05-20 Andrew Pinski <pinskia@physics.uc.edu> * optimize.c (calls_setjmp_r): Remove. diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index b3cc1de..3888834 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -1151,6 +1151,10 @@ check_for_out_of_scope_variable (tree decl) return decl; DECL_ERROR_REPORTED (decl) = 1; + + if (TREE_TYPE (decl) == error_mark_node) + return decl; + if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (decl))) { error ("name lookup of `%D' changed for new ISO `for' scoping", diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 2bfd743..3e9c2cf 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -96,6 +96,9 @@ require_complete_type (tree value) else type = TREE_TYPE (value); + if (type == error_mark_node) + return error_mark_node; + /* First, detect a valid value with a complete type. */ if (COMPLETE_TYPE_P (type)) return value; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 95fc70c..13b309c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-05-22 Wolfgang Bangerth <bangerth@dealii.org> + Roger Sayle <roger@eyesopen.com> + + * g++.dg/lookup/forscope2.C: New test case. + 2004-05-22 Ben Elliston <bje@au.ibm.com> * gcc.dg/cpp/Wmissingdirs.c: New. diff --git a/gcc/testsuite/g++.dg/lookup/forscope2.C b/gcc/testsuite/g++.dg/lookup/forscope2.C new file mode 100644 index 0000000..1fed957 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/forscope2.C @@ -0,0 +1,9 @@ +// { dg-do compile } + +struct S { + void foo() { + for (_ptr; ;) {} // { dg-error "not declared" } + _ptr = 0; + } +}; + |