diff options
| author | Jason Merrill <jason@redhat.com> | 2017-03-17 14:42:09 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-03-17 14:42:09 -0400 |
| commit | c7ec585d78b25e45813c02f3371714dd72401c63 (patch) | |
| tree | f50d65694be61c920a049bf106b0ac2293f71863 | |
| parent | 2da189b6ead100a2741fbc27abdad5bc479ac828 (diff) | |
| download | gcc-c7ec585d78b25e45813c02f3371714dd72401c63.zip gcc-c7ec585d78b25e45813c02f3371714dd72401c63.tar.gz gcc-c7ec585d78b25e45813c02f3371714dd72401c63.tar.bz2 | |
PR c++/80073 - C++17 ICE with virtual base.
* decl.c (xref_basetypes): Also check for indirect vbases.
From-SVN: r246242
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/vbase2.C | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 089d388..a5c150a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-03-17 Jason Merrill <jason@redhat.com> + + PR c++/80073 - C++17 ICE with virtual base. + * decl.c (xref_basetypes): Also check for indirect vbases. + 2017-03-16 Jason Merrill <jason@redhat.com> * decl.c (start_enum): std::byte aliases anything. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 61ecf81..bf24e8b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -13812,6 +13812,9 @@ xref_basetypes (tree ref, tree base_list) if (max_vbases) { + /* An aggregate can't have virtual base classes. */ + CLASSTYPE_NON_AGGREGATE (ref) = true; + vec_alloc (CLASSTYPE_VBASECLASSES (ref), max_vbases); if (max_dvbases) diff --git a/gcc/testsuite/g++.dg/init/vbase2.C b/gcc/testsuite/g++.dg/init/vbase2.C new file mode 100644 index 0000000..1711ea9 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/vbase2.C @@ -0,0 +1,8 @@ +// PR c++/80073 +// { dg-do compile { target c++11 } } + +struct A {}; + +struct B : virtual A {}; + +struct C : B {} c {}; |