From 6b7d53a25933f4aed71d6d5134e971bd995f8973 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 22 Dec 2020 16:40:37 -0500 Subject: [PATCH] c++: Fix constexpr array ICE [PR98332] The element initializer was non-constant, so its CONSTRUCTOR element ended up NULL, so unshare_constructor crashed trying to look at it. This patch fixes this in two places: First, by returning when we see a non-constant initializer; second, by not crashing on NULL. gcc/cp/ChangeLog: PR c++/98332 * constexpr.c (unshare_constructor): Check for NULL. (cxx_eval_vec_init_1): Always exit early if non-constant. gcc/testsuite/ChangeLog: PR c++/98332 * g++.dg/cpp0x/constexpr-overflow3.C: New test. --- gcc/cp/constexpr.c | 4 ++-- gcc/testsuite/g++.dg/cpp0x/constexpr-overflow3.C | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-overflow3.C diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index b6f3e6e..f7cc413 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -1524,7 +1524,7 @@ unshare_constructor (tree t MEM_STAT_DECL) vec *v = CONSTRUCTOR_ELTS (n); constructor_elt *ce; for (HOST_WIDE_INT i = 0; vec_safe_iterate (v, i, &ce); ++i) - if (TREE_CODE (ce->value) == CONSTRUCTOR) + if (ce->value && TREE_CODE (ce->value) == CONSTRUCTOR) ptrs.safe_push (&ce->value); } return t; @@ -4548,7 +4548,7 @@ cxx_eval_vec_init_1 (const constexpr_ctx *ctx, tree atype, tree init, eltinit = cxx_eval_constant_expression (&new_ctx, eltinit, lval, non_constant_p, overflow_p); } - if (*non_constant_p && !ctx->quiet) + if (*non_constant_p) break; if (new_ctx.ctor != ctx->ctor) { diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow3.C new file mode 100644 index 0000000..22d4c59 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-overflow3.C @@ -0,0 +1,5 @@ +// PR c++/98332 +// { dg-do compile { target c++11 } } + +struct S { int a = 2147483647 + 1; }; // { dg-warning "overflow" } +struct { S b[2][1][1][1]; } c; -- 2.7.4