public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r10-10668] c++: Fix handling of temporaries with consteval ctors and non-trivial dtors [PR104055] Date: Tue, 10 May 2022 08:22:54 +0000 (GMT) [thread overview] Message-ID: <20220510082254.A7CB438346B3@sourceware.org> (raw) https://gcc.gnu.org/g:1c3c885e1bba86f01917445928006d26062c5b15 commit r10-10668-g1c3c885e1bba86f01917445928006d26062c5b15 Author: Jakub Jelinek <jakub@redhat.com> Date: Wed Jan 19 00:42:18 2022 +0100 c++: Fix handling of temporaries with consteval ctors and non-trivial dtors [PR104055] The following testcase is miscompiled. We see the constructor is immediate, in build_over_call we trigger: if (obj_arg && is_dummy_object (obj_arg)) { call = build_cplus_new (DECL_CONTEXT (fndecl), call, complain); obj_arg = NULL_TREE; } which makes call a TARGET_EXPR with the dtor in TARGET_EXPR_CLEANUP, but then call cxx_constant_value on it. In cxx_eval_outermost_constant_expr it triggers the: else if (TREE_CODE (t) != CONSTRUCTOR) { r = get_target_expr_sfinae (r, tf_warning_or_error | tf_no_cleanup); TREE_CONSTANT (r) = true; } which wraps the CONSTRUCTOR r into a new TARGET_EXPR, but one without dtors (I think we need e.g. the TREE_CONSTANT for the callers), and finally build_over_call uses that. The following patch fixes that by using get_target_expr instead of get_target_expr_sfinae + TREE_CONSTANT (r) = true if t is a TARGET_EXPR with non-NULL TARGET_EXPR_CLEANUP. 2022-01-19 Jakub Jelinek <jakub@redhat.com> PR c++/104055 * constexpr.c (cxx_eval_outermost_constant_expr): If t is a TARGET_EXPR with TARGET_EXPR_CLEANUP, use get_target_expr rather than get_target_expr_sfinae with tf_no_cleanup, and don't set TREE_CONSTANT. * g++.dg/cpp2a/consteval27.C: New test. (cherry picked from commit 1a5145f1e3adf8b2ba4ad416a5ddef59a1e34d48) Diff: --- gcc/cp/constexpr.c | 6 +++++- gcc/testsuite/g++.dg/cpp2a/consteval27.C | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 2efa0a1d8ec..cd8ef069dde 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -6973,7 +6973,11 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant, if (TREE_CODE (t) == TARGET_EXPR && TARGET_EXPR_INITIAL (t) == r) return t; - else if (TREE_CODE (t) != CONSTRUCTOR) + else if (TREE_CODE (t) == CONSTRUCTOR) + ; + else if (TREE_CODE (t) == TARGET_EXPR && TARGET_EXPR_CLEANUP (t)) + r = get_target_expr (r); + else { r = get_target_expr_sfinae (r, tf_warning_or_error | tf_no_cleanup); TREE_CONSTANT (r) = true; diff --git a/gcc/testsuite/g++.dg/cpp2a/consteval27.C b/gcc/testsuite/g++.dg/cpp2a/consteval27.C new file mode 100644 index 00000000000..72d56df9dc5 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/consteval27.C @@ -0,0 +1,18 @@ +// PR c++/104055 +// { dg-do run { target c++20 } } + +int g; + +struct A { + ~A () { if (a != 17 || b != 26) __builtin_abort (); g = 42; } + consteval A () : a (17), b (26) {} + int a, b; +}; + +int +main () +{ + A{}; + if (g != 42) + __builtin_abort (); +}
reply other threads:[~2022-05-10 8:22 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220510082254.A7CB438346B3@sourceware.org \ --to=jakub@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).