diff options
| -rw-r--r-- | gcc/cp/constexpr.c | 34 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/constexpr-dtor9.C | 31 |
2 files changed, 43 insertions, 22 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index b6f9c43..e6ab5ee 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -6018,8 +6018,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, /* Evaluate the cleanups. */ FOR_EACH_VEC_ELT_REVERSE (cleanups, i, cleanup) cxx_eval_constant_expression (ctx, cleanup, false, - non_constant_p, overflow_p, - jump_target); + non_constant_p, overflow_p); } break; @@ -6030,29 +6029,20 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, if (!*non_constant_p) /* Also evaluate the cleanup. */ cxx_eval_constant_expression (ctx, TREE_OPERAND (t, 1), true, - non_constant_p, overflow_p, - jump_target); + non_constant_p, overflow_p); break; case CLEANUP_STMT: - { - tree initial_jump_target = jump_target ? *jump_target : NULL_TREE; - r = cxx_eval_constant_expression (ctx, CLEANUP_BODY (t), lval, - non_constant_p, overflow_p, - jump_target); - if (!CLEANUP_EH_ONLY (t) && !*non_constant_p) - { - iloc_sentinel ils (loc); - /* Also evaluate the cleanup. If we weren't skipping at the - start of the CLEANUP_BODY, change jump_target temporarily - to &initial_jump_target, so that even a return or break or - continue in the body doesn't skip the cleanup. */ - cxx_eval_constant_expression (ctx, CLEANUP_EXPR (t), true, - non_constant_p, overflow_p, - jump_target ? &initial_jump_target - : NULL); - } - } + r = cxx_eval_constant_expression (ctx, CLEANUP_BODY (t), lval, + non_constant_p, overflow_p, + jump_target); + if (!CLEANUP_EH_ONLY (t) && !*non_constant_p) + { + iloc_sentinel ils (loc); + /* Also evaluate the cleanup. */ + cxx_eval_constant_expression (ctx, CLEANUP_EXPR (t), true, + non_constant_p, overflow_p); + } break; /* These differ from cxx_eval_unary_expression in that this doesn't diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor9.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor9.C new file mode 100644 index 0000000..975e5fc --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor9.C @@ -0,0 +1,31 @@ +// PR c++/97790 +// { dg-do compile { target c++20 } } + +struct S +{ + int *d; + int n; + constexpr S () : d(new int[1]{}), n(1) {} + constexpr ~S () { delete [] d; } +}; + +constexpr S +foo () +{ + return S (); +} + +constexpr int +bar () +{ + return foo ().n; +} + +constexpr int +baz () +{ + return S ().n; +} + +constexpr int a = baz (); +constexpr int b = bar (); |