From ce36ba09fe2c1b8523265e217f8cb478f50607c3 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 4 Apr 2019 22:52:23 -0400 Subject: [PATCH] PR c++/89948 - ICE with break in statement-expr. * constexpr.c (cxx_eval_statement_list): Jumping out of a statement-expr is non-constant. From-SVN: r270161 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/constexpr.c | 9 +++++++++ gcc/testsuite/g++.dg/ext/stmtexpr23.C | 10 ++++++++++ 3 files changed, 25 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/stmtexpr23.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ad4dba4..6bfd26c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2019-04-04 Jason Merrill + PR c++/89948 - ICE with break in statement-expr. + * constexpr.c (cxx_eval_statement_list): Jumping out of a + statement-expr is non-constant. + +2019-04-04 Jason Merrill + PR c++/89966 - error with non-type auto tparm. * pt.c (do_auto_deduction): Clear tf_partial. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 53854a8..0ce5618 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -4153,6 +4153,15 @@ cxx_eval_statement_list (const constexpr_ctx *ctx, tree t, if (returns (jump_target) || breaks (jump_target)) break; } + if (*jump_target && jump_target == &local_target) + { + /* We aren't communicating the jump to our caller, so give up. We don't + need to support evaluation of jumps out of statement-exprs. */ + if (!ctx->quiet) + error_at (cp_expr_loc_or_loc (r, input_location), + "statement is not a constant expression"); + *non_constant_p = true; + } return r; } diff --git a/gcc/testsuite/g++.dg/ext/stmtexpr23.C b/gcc/testsuite/g++.dg/ext/stmtexpr23.C new file mode 100644 index 0000000..c6aaea7 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/stmtexpr23.C @@ -0,0 +1,10 @@ +// PR c++/89948 +// { dg-options "" } + +void f () +{ + int a = 0; + for (;;) + for (;a=+({break;1;});) + {} +} -- 2.7.4