diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-11-28 20:20:02 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-11-28 20:20:02 +0100 |
| commit | f28fd43ea80711f0735903a09f67ceb7278a7c58 (patch) | |
| tree | 4949282cb8fd2aa13532bfe30e3a89ce8025ccae /gcc | |
| parent | d057004733e8e4893cab758d51121b6750a9b438 (diff) | |
| download | gcc-f28fd43ea80711f0735903a09f67ceb7278a7c58.zip gcc-f28fd43ea80711f0735903a09f67ceb7278a7c58.tar.gz gcc-f28fd43ea80711f0735903a09f67ceb7278a7c58.tar.bz2 | |
re PR c++/72808 (ICE on valid c++ code in verify_type (gcc/tree.c:14047))
PR c++/72808
* decl.c (finish_enum_value_list): Call fixup_type_variants on
current_class_type after
insert_late_enum_def_into_classtype_sorted_fields.
* g++.dg/debug/pr72808.C: New test.
Co-Authored-By: Jason Merrill <jason@redhat.com>
From-SVN: r242930
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/debug/pr72808.C | 24 |
4 files changed, 40 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f442a7a..476ff654 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,4 +1,12 @@ 2016-11-28 Jakub Jelinek <jakub@redhat.com> + Jason Merrill <jason@redhat.com> + + PR c++/72808 + * decl.c (finish_enum_value_list): Call fixup_type_variants on + current_class_type after + insert_late_enum_def_into_classtype_sorted_fields. + +2016-11-28 Jakub Jelinek <jakub@redhat.com> PR c++/77591 * typeck.c (maybe_warn_about_returning_address_of_local): Optimize diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 6893eae..f0850d7 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -14280,8 +14280,11 @@ finish_enum_value_list (tree enumtype) if (at_class_scope_p () && COMPLETE_TYPE_P (current_class_type) && UNSCOPED_ENUM_P (enumtype)) - insert_late_enum_def_into_classtype_sorted_fields (enumtype, - current_class_type); + { + insert_late_enum_def_into_classtype_sorted_fields (enumtype, + current_class_type); + fixup_type_variants (current_class_type); + } /* Finish debugging output for this type. */ rest_of_type_compilation (enumtype, namespace_bindings_p ()); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 04a6840..0579927 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2016-11-28 Jakub Jelinek <jakub@redhat.com> + PR c++/72808 + * g++.dg/debug/pr72808.C: New test. + PR rtl-optimization/78546 * gcc.dg/torture/pr78546-1.c: New test. * gcc.dg/torture/pr78546-2.c: New test. diff --git a/gcc/testsuite/g++.dg/debug/pr72808.C b/gcc/testsuite/g++.dg/debug/pr72808.C new file mode 100644 index 0000000..7e4688c --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/pr72808.C @@ -0,0 +1,24 @@ +// PR c++/72808 +// { dg-do compile } +// { dg-options "-g -std=c++14" } + +struct A +{ + virtual void foo (); +}; + +struct B : A +{ + void foo (); + enum C : int; +}; + +enum B::C : int +{ + D +}; + +void +B::foo () +{ +} |