diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-02-21 19:00:35 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-02-21 19:00:35 +0100 |
| commit | b7280ac2708e2a36337347de3c27e8fda914683e (patch) | |
| tree | 2fb263f2ae604a84bb90c1499aca21471c380c7c /gcc | |
| parent | 5c3f1d7b10ab48d50e80359eb18c0edc1e3ed402 (diff) | |
| download | gcc-b7280ac2708e2a36337347de3c27e8fda914683e.zip gcc-b7280ac2708e2a36337347de3c27e8fda914683e.tar.gz gcc-b7280ac2708e2a36337347de3c27e8fda914683e.tar.bz2 | |
re PR c++/79654 (ICE on invalid c++ code in register_dtor_fn in cp/decl.c:7877)
PR c++/79654
* decl.c (cp_finish_decomp): Don't set decl's type to error_mark_node
on error.
* pt.c (tsubst_decomp_names): Return error_mark_node if the first
decl after the decomposition artificial decl has error_mark_node.
* decl2.c (prune_vars_needing_no_initialization): Use error_operand_p
instead of just == error_mark_node comparison.
* g++.dg/cpp1z/decomp26.C: New test.
Co-Authored-By: Paolo Carlini <paolo.carlini@oracle.com>
From-SVN: r245639
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 1 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/decomp26.C | 6 |
6 files changed, 26 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a63eb4b..8222541 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,4 +1,15 @@ 2017-02-21 Jakub Jelinek <jakub@redhat.com> + Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/79654 + * decl.c (cp_finish_decomp): Don't set decl's type to error_mark_node + on error. + * pt.c (tsubst_decomp_names): Return error_mark_node if the first + decl after the decomposition artificial decl has error_mark_node. + * decl2.c (prune_vars_needing_no_initialization): Use error_operand_p + instead of just == error_mark_node comparison. + +2017-02-21 Jakub Jelinek <jakub@redhat.com> PR sanitizer/79589 * decl.c: Include gimplify.h. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 5ab9a20..fa1d645 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7386,7 +7386,6 @@ cp_finish_decomp (tree decl, tree first, unsigned int count) } first = DECL_CHAIN (first); } - TREE_TYPE (decl) = error_mark_node; if (DECL_P (decl) && DECL_NAMESPACE_SCOPE_P (decl)) SET_DECL_ASSEMBLER_NAME (decl, get_identifier ("<decomp>")); return; diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index d2e57ff..b50fadf 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3879,7 +3879,7 @@ prune_vars_needing_no_initialization (tree *vars) tree init = TREE_PURPOSE (t); /* Deal gracefully with error. */ - if (decl == error_mark_node) + if (error_operand_p (decl)) { var = &TREE_CHAIN (t); continue; diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2cac24f..c29e691 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15610,6 +15610,11 @@ tsubst_decomp_names (tree decl, tree pattern_decl, tree args, && DECL_NAME (decl2); decl2 = DECL_CHAIN (decl2)) { + if (TREE_TYPE (decl2) == error_mark_node && *cnt == 0) + { + gcc_assert (errorcount); + return error_mark_node; + } (*cnt)++; gcc_assert (DECL_HAS_VALUE_EXPR_P (decl2)); tree v = DECL_VALUE_EXPR (decl2); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index abefa2d..1262b2e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2017-02-21 Jakub Jelinek <jakub@redhat.com> + PR c++/79654 + * g++.dg/cpp1z/decomp26.C: New test. + PR sanitizer/79589 * g++.dg/ubsan/pr79589.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp1z/decomp26.C b/gcc/testsuite/g++.dg/cpp1z/decomp26.C new file mode 100644 index 0000000..f413920 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/decomp26.C @@ -0,0 +1,6 @@ +// PR c++/79654 +// { dg-do compile { target c++11 } } +// { dg-options "" } + +template<typename T> T &make(); // { dg-warning "decomposition declaration only available with" "" { target c++14_down } .+1 } +auto [d1, d2] = make<int>(); // { dg-error "cannot decompose non-array non-class type" } |