From c9bdad35171f64bcabad635254fa9f3dfc05a376 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Tue, 1 Jul 2003 07:17:03 +0000 Subject: [PATCH] re PR c++/9559 (ICE with invalid initialization of a static const member) PR c++/9559 * decl2.c (grokfield): Do not build NOP_EXPRs around the error_mark_node. PR c++/9559 * g++.dg/init/static1.C: New test. From-SVN: r68764 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl2.c | 7 +------ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/init/static1.C | 4 ++++ 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/init/static1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 040582d..45a879d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-07-01 Mark Mitchell + + PR c++/9559 + * decl2.c (grokfield): Do not build NOP_EXPRs around the + error_mark_node. + 2003-06-30 Neil Booth * Make-lang.in: Update. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 9a96000..d27bacd 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -951,12 +951,7 @@ grokfield (tree declarator, tree declspecs, tree init, tree asmspec_tree, init = decl_constant_value (init); else if (TREE_CODE (init) == CONSTRUCTOR) init = digest_init (TREE_TYPE (value), init, (tree *)0); - if (init == error_mark_node) - /* We must make this look different than `error_mark_node' - because `decl_const_value' would mis-interpret it - as only meaning that this VAR_DECL is defined. */ - init = build1 (NOP_EXPR, TREE_TYPE (value), init); - else if (! TREE_CONSTANT (init)) + if (init != error_mark_node && ! TREE_CONSTANT (init)) { /* We can allow references to things that are effectively static, since references are initialized with the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5d0d274..cf664e4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-07-01 Mark Mitchell + + PR c++/9559 + * g++.dg/init/static1.C: New test. + 2003-06-30 Volker Reichelt * Changelog: Remove ">>>>>>>" from previous change. diff --git a/gcc/testsuite/g++.dg/init/static1.C b/gcc/testsuite/g++.dg/init/static1.C new file mode 100644 index 0000000..7609215 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/static1.C @@ -0,0 +1,4 @@ +struct A { + static const int size = BOGUS; // { dg-error "" } +}; +const int A::size; -- 2.7.4