diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2006-05-30 21:25:02 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2006-05-30 21:25:02 +0000 |
| commit | 606791f69894426ecd59d7baf18664fb77138324 (patch) | |
| tree | 4a0522dc4f55cb8eb61381e3632191ea2dbb06e2 | |
| parent | c98662e02092adc0bd3fe4cf898f5bf2ba533f37 (diff) | |
| download | gcc-606791f69894426ecd59d7baf18664fb77138324.zip gcc-606791f69894426ecd59d7baf18664fb77138324.tar.gz gcc-606791f69894426ecd59d7baf18664fb77138324.tar.bz2 | |
re PR c++/27803 (ICE with invalid bit-field)
PR c++/27803
* class.c (check_bitfield_decl): Ensure that all bitfields have
integral type.
PR c++/27803
* g++.dg/parse/bitfield1.C: New test.
From-SVN: r114245
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 24 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/bitfield1.C | 11 |
4 files changed, 34 insertions, 12 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 03db715..fcfb7f3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-05-30 Mark Mitchell <mark@codesourcery.com> + + PR c++/27803 + * class.c (check_bitfield_decl): Ensure that all bitfields have + integral type. + 2006-05-29 Kazu Hirata <kazu@codesourcery.com> * pt.c (convert_nontype_argument): Fix a typo in an error diff --git a/gcc/cp/class.c b/gcc/cp/class.c index f592fe6..a1460c0 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2625,21 +2625,25 @@ static void check_bitfield_decl (tree field) { tree type = TREE_TYPE (field); - tree w = NULL_TREE; + tree w; + + /* Extract the declared width of the bitfield, which has been + temporarily stashed in DECL_INITIAL. */ + w = DECL_INITIAL (field); + gcc_assert (w != NULL_TREE); + /* Remove the bit-field width indicator so that the rest of the + compiler does not treat that value as an initializer. */ + DECL_INITIAL (field) = NULL_TREE; /* Detect invalid bit-field type. */ - if (DECL_INITIAL (field) - && ! INTEGRAL_TYPE_P (TREE_TYPE (field))) + if (!INTEGRAL_TYPE_P (type)) { error ("bit-field %q+#D with non-integral type", field); + TREE_TYPE (field) = error_mark_node; w = error_mark_node; } - - /* Detect and ignore out of range field width. */ - if (DECL_INITIAL (field)) + else { - w = DECL_INITIAL (field); - /* Avoid the non_lvalue wrapper added by fold for PLUS_EXPRs. */ STRIP_NOPS (w); @@ -2676,10 +2680,6 @@ check_bitfield_decl (tree field) warning (0, "%q+D is too small to hold all values of %q#T", field, type); } - /* Remove the bit-field width indicator so that the rest of the - compiler does not treat that value as an initializer. */ - DECL_INITIAL (field) = NULL_TREE; - if (w != error_mark_node) { DECL_SIZE (field) = convert (bitsizetype, w); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ecc1cc1..1cc2f13 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-05-30 Mark Mitchell <mark@codesourcery.com> + + PR c++/27803 + * g++.dg/parse/bitfield1.C: New test. + 2006-05-30 Roger Sayle <roger@eyesopen.com> * gcc.target/ppc-eq0-1.c: New test case. diff --git a/gcc/testsuite/g++.dg/parse/bitfield1.C b/gcc/testsuite/g++.dg/parse/bitfield1.C new file mode 100644 index 0000000..70fe5cb --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/bitfield1.C @@ -0,0 +1,11 @@ +// PR c++/27803 + +struct A +{ + double i : 8; // { dg-error "type" } +}; + +void foo(A& a) +{ + (char)a.i; +} |