diff options
| author | Volker Reichelt <reichelt@igpm.rwth-aachen.de> | 2006-06-05 00:24:41 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@gcc.gnu.org> | 2006-06-05 00:24:41 +0000 |
| commit | 1ac8104c2f17d63ea8272c358c0cf3650b66532e (patch) | |
| tree | 9e5e112a3a5fef1467d387ee288b85a3f3ec4c21 /gcc | |
| parent | 30f87202134f7da5b53734d2101df72300855c27 (diff) | |
| download | gcc-1ac8104c2f17d63ea8272c358c0cf3650b66532e.zip gcc-1ac8104c2f17d63ea8272c358c0cf3650b66532e.tar.gz gcc-1ac8104c2f17d63ea8272c358c0cf3650b66532e.tar.bz2 | |
re PR c++/27804 (ICE with invalid const variable)
PR c++/27804
* init.c (constant_value_1): Return decl instead of error_mark_node
for invalid initializers.
PR c++/27804
* g++.dg/init/const4.C: New test.
* g++.dg/init/member1.C: Add error-marker.
* g++.dg/other/fold1.C: Adjust error-marker.
From-SVN: r114377
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/init.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/const4.C | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/member1.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/fold1.C | 2 |
6 files changed, 24 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0d0c6a5..7f118ab 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-06-05 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + PR c++/27804 + * init.c (constant_value_1): Return decl instead of error_mark_node + for invalid initializers. + 2006-06-01 Andrew Pinski <pinskia@physics.uc.edu> PR c++/27592 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 99d5d99..8a338fa 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1483,7 +1483,7 @@ constant_value_1 (tree decl, bool integral_p) init = DECL_INITIAL (decl); } if (init == error_mark_node) - return error_mark_node; + return decl; if (!init || !TREE_TYPE (init) || (integral_p diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9b484a9..4609529 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2006-06-05 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + PR c++/27804 + * g++.dg/init/const4.C: New test. + * g++.dg/init/member1.C: Add error-marker. + * g++.dg/other/fold1.C: Adjust error-marker. + 2006-06-04 Volker Reichelt <reichelt@igpm.rwth-aachen.de> PR c++/27601 diff --git a/gcc/testsuite/g++.dg/init/const4.C b/gcc/testsuite/g++.dg/init/const4.C new file mode 100644 index 0000000..b99726b --- /dev/null +++ b/gcc/testsuite/g++.dg/init/const4.C @@ -0,0 +1,8 @@ +// PR c++/27804 +// { dg-do compile } + +bool foo() +{ + const int i = X; // { dg-error "not declared" } + return i > 0; +} diff --git a/gcc/testsuite/g++.dg/init/member1.C b/gcc/testsuite/g++.dg/init/member1.C index aededf2..e2af080 100644 --- a/gcc/testsuite/g++.dg/init/member1.C +++ b/gcc/testsuite/g++.dg/init/member1.C @@ -11,7 +11,7 @@ template<int> struct B {}; template<typename T> struct C { static const int i = A<T>::i; // { dg-error "incomplete" } - static const int j = i; + static const int j = i; // { dg-error "non-constant expression" } B<j> b; // { dg-error "not a valid template arg" } }; diff --git a/gcc/testsuite/g++.dg/other/fold1.C b/gcc/testsuite/g++.dg/other/fold1.C index f1f0dd9..b085a84f0 100644 --- a/gcc/testsuite/g++.dg/other/fold1.C +++ b/gcc/testsuite/g++.dg/other/fold1.C @@ -4,5 +4,5 @@ struct A { static const int i = i; // { dg-error "not declared" } - int x[i]; // { dg-error "variable-size array" } + int x[i]; // { dg-error "integral constant-expression" } }; |