diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-04-06 19:27:01 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-04-06 19:27:01 +0200 |
| commit | e83bc9d77564eeadcc415dbbc1352b3aaabb4fa7 (patch) | |
| tree | ae8fda3ba70b77bd8111b559c84c2706192a4727 | |
| parent | cb731872870ff15c4d4a4dc081191ed607faaa2b (diff) | |
| download | gcc-e83bc9d77564eeadcc415dbbc1352b3aaabb4fa7.zip gcc-e83bc9d77564eeadcc415dbbc1352b3aaabb4fa7.tar.gz gcc-e83bc9d77564eeadcc415dbbc1352b3aaabb4fa7.tar.bz2 | |
re PR c++/85210 (ICE with broken structured binding in template)
PR c++/85210
* pt.c (tsubst_decomp_names): Return error_mark_node and assert
errorcount is set if tsubst doesn't return a VAR_DECL.
* g++.dg/cpp1z/decomp42.C: New test.
From-SVN: r259181
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/decomp42.C | 18 |
4 files changed, 35 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a27484b..119741a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-04-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/85210 + * pt.c (tsubst_decomp_names): Return error_mark_node and assert + errorcount is set if tsubst doesn't return a VAR_DECL. + 2018-04-06 David Malcolm <dmalcolm@redhat.com> PR c++/85021 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 3bac756..450ffae 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -16235,6 +16235,12 @@ tsubst_decomp_names (tree decl, tree pattern_decl, tree args, DECL_HAS_VALUE_EXPR_P (decl2) = 1; if (VAR_P (decl3)) DECL_TEMPLATE_INSTANTIATED (decl3) = 1; + else + { + gcc_assert (errorcount); + decl = error_mark_node; + continue; + } maybe_push_decl (decl3); if (error_operand_p (decl3)) decl = error_mark_node; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e192061..30423e2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-04-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/85210 + * g++.dg/cpp1z/decomp42.C: New test. + 2018-04-06 David Malcolm <dmalcolm@redhat.com> PR c++/85021 diff --git a/gcc/testsuite/g++.dg/cpp1z/decomp42.C b/gcc/testsuite/g++.dg/cpp1z/decomp42.C new file mode 100644 index 0000000..c01db7f --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/decomp42.C @@ -0,0 +1,18 @@ +// PR c++/85210 +// { dg-do compile { target c++11 } } +// { dg-options "" } + +struct A { int i; }; + +template <int> +void +foo (int j) +{ + auto [j] = A{j}; // { dg-error "shadows a parameter" } +} // { dg-warning "structured bindings only available with" "" { target c++14_down } .-1 } + +void +bar () +{ + foo<0> (0); +} |