diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-11-27 22:04:41 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-11-27 22:04:41 +0100 |
| commit | d15a79696738d4f81b17774af7f7d7a80f429d5c (patch) | |
| tree | d77dff145249da75eace3e836ebfb6b996256a7b /gcc | |
| parent | fc74d562dee21346405b9bb4a7fe3bd0f2c43758 (diff) | |
| download | gcc-d15a79696738d4f81b17774af7f7d7a80f429d5c.zip gcc-d15a79696738d4f81b17774af7f7d7a80f429d5c.tar.gz gcc-d15a79696738d4f81b17774af7f7d7a80f429d5c.tar.bz2 | |
re PR c++/88181 (ICE: verify_type failed (error: type variant differs by TYPE_PACKED))
PR c++/88181
* class.c (fixup_attribute_variants): Also propagate TYPE_PACKED
to variants.
* g++.dg/debug/pr88181.C: New test.
From-SVN: r266527
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/debug/pr88181.C | 29 |
4 files changed, 40 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8e157f6..41e66c0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-11-27 Jakub Jelinek <jakub@redhat.com> + + PR c++/88181 + * class.c (fixup_attribute_variants): Also propagate TYPE_PACKED + to variants. + 2018-11-26 Marek Polacek <polacek@redhat.com> PR c++/88120 - ICE when calling save_expr in a template. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 0b50f67..be3b4bb 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1951,6 +1951,7 @@ fixup_attribute_variants (tree t) unsigned align = TYPE_ALIGN (t); bool user_align = TYPE_USER_ALIGN (t); bool may_alias = lookup_attribute ("may_alias", attrs); + bool packed = TYPE_PACKED (t); if (may_alias) fixup_may_alias (t); @@ -1968,6 +1969,7 @@ fixup_attribute_variants (tree t) else TYPE_USER_ALIGN (variants) = user_align; SET_TYPE_ALIGN (variants, valign); + TYPE_PACKED (variants) = packed; if (may_alias) fixup_may_alias (variants); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0e211c9..d35a3f8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2018-11-27 Jakub Jelinek <jakub@redhat.com> + PR c++/88181 + * g++.dg/debug/pr88181.C: New test. + PR middle-end/87157 * gcc.dg/vect/costmodel/ppc/costmodel-vect-33.c (main1): Add noipa attribute. diff --git a/gcc/testsuite/g++.dg/debug/pr88181.C b/gcc/testsuite/g++.dg/debug/pr88181.C new file mode 100644 index 0000000..fc6f813 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/pr88181.C @@ -0,0 +1,29 @@ +// PR c++/88181 +// { dg-do compile } +// { dg-options "-fpack-struct -g -std=c++11" } + +template <typename T> struct A { typedef T B; }; +template <typename...> class C; +template <typename e> struct D { constexpr D (e) {} }; +template <int, typename...> struct E; +template <int N, typename T, typename... U> +struct E<N, T, U...> : E<1, U...>, D<T> { + constexpr E (T x, U... y) : E<1, U...>(y...), D<T>(x) {} +}; +template <int N, typename T> struct E<N, T> : D<T> { + constexpr E (T x) : D<T>(x) {} +}; +template <typename T, typename U> struct C<T, U> : E<0, T, U> { + constexpr C (T x, U y) : E<0, T, U>(x, y) {} + void operator= (typename A<const C>::B); +}; +struct F {}; +struct G {}; + +int +main () +{ + F f; + G g; + constexpr C<F, G> c(f, g); +} |