diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-03-20 20:45:09 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-03-20 20:45:09 +0100 |
| commit | 7614d42cb4103e495f1d91c9c71bf8feae4bae69 (patch) | |
| tree | c4601b23e9a591b179b55580958c5c4bcd4b9b45 | |
| parent | 207c82c407b6fe07c5768bf0542470f97bbd1a49 (diff) | |
| download | gcc-7614d42cb4103e495f1d91c9c71bf8feae4bae69.zip gcc-7614d42cb4103e495f1d91c9c71bf8feae4bae69.tar.gz gcc-7614d42cb4103e495f1d91c9c71bf8feae4bae69.tar.bz2 | |
re PR c++/60572 (ICE deriving from class with invalid member)
PR c++/60572
* init.c (build_zero_init_1): Ignore fields with error_mark_node
type.
* g++.dg/init/pr60572.C: New test.
From-SVN: r208734
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/init.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/pr60572.C | 13 |
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 655f6d4..3d043d9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-03-20 Jakub Jelinek <jakub@redhat.com> + + PR c++/60572 + * init.c (build_zero_init_1): Ignore fields with error_mark_node + type. + 2014-03-19 Paolo Carlini <paolo.carlini@oracle.com> PR c++/51474 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 7f5d045..2e1cdde 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -192,6 +192,9 @@ build_zero_init_1 (tree type, tree nelts, bool static_storage_p, if (TREE_CODE (field) != FIELD_DECL) continue; + if (TREE_TYPE (field) == error_mark_node) + continue; + /* Don't add virtual bases for base classes if they are beyond the size of the current field, that means it is present somewhere else in the object. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f6118fd..3cadcfe 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-03-20 Jakub Jelinek <jakub@redhat.com> + + PR c++/60572 + * g++.dg/init/pr60572.C: New test. + 2014-03-20 Zhenqiang Chen <zhenqiang.chen@linaro.org> * gcc.target/arm/neon-modes-3.c: Add "-g" option. diff --git a/gcc/testsuite/g++.dg/init/pr60572.C b/gcc/testsuite/g++.dg/init/pr60572.C new file mode 100644 index 0000000..a39dfa0 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/pr60572.C @@ -0,0 +1,13 @@ +// PR c++/60572 +// { dg-do compile } + +struct A +{ + A x; // { dg-error "incomplete type" } + virtual ~A () {} +}; + +struct B : A +{ + B () : A () {} +}; |