diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/call.c | 17 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist-array11.C | 10 |
4 files changed, 33 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 831c717..d441add 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2020-02-24 Marek Polacek <polacek@redhat.com> + + PR c++/93712 - ICE with ill-formed array list-initialization. + * call.c (next_conversion): Return NULL for ck_aggr. + (build_aggr_conv): Set u.expr instead of u.next. + (build_array_conv): Likewise. + (build_complex_conv): Likewise. + (conv_get_original_expr): Handle ck_aggr. + 2020-02-24 Jakub Jelinek <jakub@redhat.com> P1937R2 - Fixing inconsistencies between const{expr,eval} functions diff --git a/gcc/cp/call.c b/gcc/cp/call.c index ed5338a..7a7f07c 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -117,13 +117,13 @@ struct conversion { /* The next conversion in the chain. Since the conversions are arranged from outermost to innermost, the NEXT conversion will actually be performed before this conversion. This variant is - used only when KIND is neither ck_identity, ck_ambig nor + used only when KIND is neither ck_identity, ck_aggr, ck_ambig nor ck_list. Please use the next_conversion function instead of using this field directly. */ conversion *next; /* The expression at the beginning of the conversion chain. This - variant is used only if KIND is ck_identity or ck_ambig. You can - use conv_get_original_expr to get this expression. */ + variant is used only if KIND is ck_identity, ck_aggr, or ck_ambig. + You can use conv_get_original_expr to get this expression. */ tree expr; /* The array of conversions for an initializer_list, so this variant is used only when KIN D is ck_list. */ @@ -861,7 +861,8 @@ next_conversion (conversion *conv) if (conv == NULL || conv->kind == ck_identity || conv->kind == ck_ambig - || conv->kind == ck_list) + || conv->kind == ck_list + || conv->kind == ck_aggr) return NULL; return conv->u.next; } @@ -1030,7 +1031,7 @@ build_aggr_conv (tree type, tree ctor, int flags, tsubst_flags_t complain) c->rank = cr_exact; c->user_conv_p = true; c->check_narrowing = true; - c->u.next = NULL; + c->u.expr = ctor; return c; } @@ -1083,7 +1084,7 @@ build_array_conv (tree type, tree ctor, int flags, tsubst_flags_t complain) c->rank = rank; c->user_conv_p = user; c->bad_p = bad; - c->u.next = build_identity_conv (TREE_TYPE (ctor), ctor); + c->u.expr = ctor; return c; } @@ -1129,7 +1130,7 @@ build_complex_conv (tree type, tree ctor, int flags, c->rank = rank; c->user_conv_p = user; c->bad_p = bad; - c->u.next = NULL; + c->u.expr = ctor; return c; } @@ -10500,7 +10501,7 @@ static tree conv_get_original_expr (conversion *c) { for (; c; c = next_conversion (c)) - if (c->kind == ck_identity || c->kind == ck_ambig) + if (c->kind == ck_identity || c->kind == ck_ambig || c->kind == ck_aggr) return c->u.expr; return NULL_TREE; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 272d4ea..7356523 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-02-24 Marek Polacek <polacek@redhat.com> + + PR c++/93712 - ICE with ill-formed array list-initialization. + * g++.dg/cpp0x/initlist-array11.C: New test. + 2020-02-20 Mark Eggleston <mark.eggleston@codethink.com> PR fortran/93604 diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array11.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array11.C new file mode 100644 index 0000000..d3e58de --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array11.C @@ -0,0 +1,10 @@ +// PR c++/93712 - ICE with ill-formed array list-initialization. +// { dg-do compile { target c++11 } } + +int f (const int (&)[2]); + +int g () +{ + const int (&r)[2] = {1, "foo"}; // { dg-error "conversion" } + return f({1, "foo"}); // { dg-error "conversion" } +} |