diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-10-11 09:07:22 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-10-11 09:07:22 +0200 |
| commit | f7904392b7b6ce8a9949b62692342f3c1cdc3621 (patch) | |
| tree | c6aeb9b6591b9c06e80c2d34d1c4ce7d3cf5fe4e | |
| parent | 6b0649cba367667c3f346a2f8ec992ddc39c13c1 (diff) | |
| download | gcc-f7904392b7b6ce8a9949b62692342f3c1cdc3621.zip gcc-f7904392b7b6ce8a9949b62692342f3c1cdc3621.tar.gz gcc-f7904392b7b6ce8a9949b62692342f3c1cdc3621.tar.bz2 | |
re PR c++/87547 (G++ reports bad type names for bit-field members)
PR c++/87547
* rtti.c (get_tinfo_decl_dynamic): Use unlowered_expr_type instead
of TREE_TYPE.
* g++.dg/rtti/typeid12.C: New test.
From-SVN: r265033
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/rtti.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/rtti/typeid12.C | 16 |
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index af8cb76..0ac28f9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-10-11 Jakub Jelinek <jakub@redhat.com> + + PR c++/87547 + * rtti.c (get_tinfo_decl_dynamic): Use unlowered_expr_type instead + of TREE_TYPE. + 2018-10-10 Marek Polacek <polacek@redhat.com> PR c++/87567 - constexpr rejects call to non-constexpr function. diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 94a9219..a0629e1 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -273,7 +273,7 @@ get_tinfo_decl_dynamic (tree exp, tsubst_flags_t complain) exp = resolve_nondeduced_context (exp, complain); /* peel back references, so they match. */ - type = non_reference (TREE_TYPE (exp)); + type = non_reference (unlowered_expr_type (exp)); /* Peel off cv qualifiers. */ type = TYPE_MAIN_VARIANT (type); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 05dab1f..f0eabfc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-10-11 Jakub Jelinek <jakub@redhat.com> + + PR c++/87547 + * g++.dg/rtti/typeid12.C: New test. + 2018-10-10 Eric Botcazou <ebotcazou@adacore.com> * g++.dg/other/pr87574.C: New test. diff --git a/gcc/testsuite/g++.dg/rtti/typeid12.C b/gcc/testsuite/g++.dg/rtti/typeid12.C new file mode 100644 index 0000000..a64d9c3 --- /dev/null +++ b/gcc/testsuite/g++.dg/rtti/typeid12.C @@ -0,0 +1,16 @@ +// PR c++/87547 +// { dg-do run } + +#include <typeinfo> + +struct S { unsigned int a : 4; unsigned int b : 12; int c; unsigned long d : 8; } s; + +int +main () +{ + if (typeid (s.a) != typeid (unsigned int) + || typeid (s.b) != typeid (unsigned int) + || typeid (s.c) != typeid (int) + || typeid (s.d) != typeid (unsigned long)) + __builtin_abort (); +} |