diff options
| author | Jason Merrill <jason@redhat.com> | 2008-04-22 19:13:19 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2008-04-22 19:13:19 -0400 |
| commit | e76d7cc71d8a0f3c56c54bfa6ce754efe084a445 (patch) | |
| tree | 6e21f144d42f52be01beb15d01a5207a8fd9e9e1 | |
| parent | 63cb92c1ee60811725c0f0b2512e7edcded5c7d4 (diff) | |
| download | gcc-e76d7cc71d8a0f3c56c54bfa6ce754efe084a445.zip gcc-e76d7cc71d8a0f3c56c54bfa6ce754efe084a445.tar.gz gcc-e76d7cc71d8a0f3c56c54bfa6ce754efe084a445.tar.bz2 | |
re PR c++/35316 (ICE with typeof/decltype and bit-fields)
PR c++/35316
* semantics.c (finish_decltype_type): Check DECL_BIT_FIELD_TYPE
to see if DECL_BIT_FIELD_TYPE should be used, not some other flag.
* typeck.c (is_bitfield_expr_with_lowered_type): Likewise.
From-SVN: r134571
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 2 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/decltype11.C | 12 |
5 files changed, 26 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 71bb45e..df32174 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2008-04-22 Jason Merrill <jason@redhat.com> + + PR c++/35316 + * semantics.c (finish_decltype_type): Check DECL_BIT_FIELD_TYPE + to see if DECL_BIT_FIELD_TYPE should be used, not some other flag. + * typeck.c (is_bitfield_expr_with_lowered_type): Likewise. + 2008-04-22 Jakub Jelinek <jakub@redhat.com> PR c++/35747 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index f31235b..7881a9f 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -4174,7 +4174,7 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p) switch (TREE_CODE (expr)) { case FIELD_DECL: - if (DECL_C_BIT_FIELD (expr)) + if (DECL_BIT_FIELD_TYPE (expr)) { type = DECL_BIT_FIELD_TYPE (expr); break; diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 9e9d461..2e2aa17 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1507,7 +1507,7 @@ is_bitfield_expr_with_lowered_type (const_tree exp) tree field; field = TREE_OPERAND (exp, 1); - if (TREE_CODE (field) != FIELD_DECL || !DECL_C_BIT_FIELD (field)) + if (TREE_CODE (field) != FIELD_DECL || !DECL_BIT_FIELD_TYPE (field)) return NULL_TREE; if (same_type_ignoring_top_level_qualifiers_p (TREE_TYPE (exp), DECL_BIT_FIELD_TYPE (field))) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 435f081..28b6431 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-04-22 Jason Merrill <jason@redhat.com> + + PR c++/35316 + * g++.dg/cpp0x/decltype11.C: New. + 2008-04-23 Jakub Jelinek <jakub@redhat.com> PR rtl-optimization/36017 diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype11.C b/gcc/testsuite/g++.dg/cpp0x/decltype11.C new file mode 100644 index 0000000..ac32d34 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/decltype11.C @@ -0,0 +1,12 @@ +// PR c++/35316 +// { dg-options "-std=c++0x" } + +template<int> struct A +{ + int i : 2; + + void foo() + { + decltype(i) j; + } +}; |