diff options
| author | Jason Merrill <jason@redhat.com> | 2018-04-04 16:42:33 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2018-04-04 16:42:33 +0000 |
| commit | ba40243e411a99e5dcac8025016ad7d3501bbbcc (patch) | |
| tree | bf3c57e62d431722c3f881808b78379de7bb6279 | |
| parent | 32286c0f1331290e10ed009a9691a7b295ad4a6d (diff) | |
PR c++/85148 - ICE with 'this' in array NSDMI.
* tree.c (replace_placeholders_r): Use handled_component_p.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@259088 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr11.C | 12 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0c71d2bd9de..61483a5fa79 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-04-04 Jason Merrill <jason@redhat.com> + + PR c++/85148 - ICE with 'this' in array NSDMI. + * tree.c (replace_placeholders_r): Use handled_component_p. + 2018-04-04 Ville Voutilainen <ville.voutilainen@gmail.com> PR c++/65923 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index e75c88d6e8f..7ddc2cb5e2d 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3145,7 +3145,7 @@ replace_placeholders_r (tree* t, int* walk_subtrees, void* data_) for (; !same_type_ignoring_top_level_qualifiers_p (TREE_TYPE (*t), TREE_TYPE (x)); x = TREE_OPERAND (x, 0)) - gcc_assert (TREE_CODE (x) == COMPONENT_REF); + gcc_assert (handled_component_p (x)); *t = unshare_expr (x); *walk_subtrees = false; d->seen = true; diff --git a/gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr11.C b/gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr11.C new file mode 100644 index 00000000000..09591df3807 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr11.C @@ -0,0 +1,12 @@ +// PR c++/85148 +// { dg-do compile { target c++14 } } + +template<typename T> struct A +{ + T x[1]{(__PTRDIFF_TYPE__)this}; +}; + +void foo() +{ + A<A<__PTRDIFF_TYPE__>> a{}; +} |