public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jason Merrill <jason@redhat.com>
To: gcc-patches@gcc.gnu.org
Subject: [pushed 3/4] c++: fix in-charge parm in constexpr
Date: Wed, 13 Dec 2023 11:47:39 -0500	[thread overview]
Message-ID: <20231213164740.1591535-3-jason@redhat.com> (raw)
In-Reply-To: <20231213164740.1591535-1-jason@redhat.com>

Tested x86_64-pc-linux-gnu, applying to trunk.

-- 8< --

I was puzzled by the proposed patch for PR71093 specifically ignoring the
in-charge parameter; the problem turned out to be that when
cxx_eval_call_expression jumps from the clone to the cloned function, it
assumes that the latter has the same parameters, and so the in-charge parm
doesn't get an argument.  Since a class with vbases can't have constexpr
'tors there isn't actually a need for an in-charge parameter in a
destructor, but we used to use it for deleting destructors and never removed
it.  I have a patch to do that for GCC 15, but for now let's work around it.

gcc/cp/ChangeLog:

	* constexpr.cc (cxx_eval_call_expression): Handle missing in-charge
	argument.
---
 gcc/cp/constexpr.cc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc
index 4cf9dd71b05..9d9e96c2afd 100644
--- a/gcc/cp/constexpr.cc
+++ b/gcc/cp/constexpr.cc
@@ -3169,6 +3169,19 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
 	      ctx->global->put_value (remapped, arg);
 	      remapped = DECL_CHAIN (remapped);
 	    }
+	  for (; remapped; remapped = TREE_CHAIN (remapped))
+	    if (DECL_NAME (remapped) == in_charge_identifier)
+	      {
+		/* FIXME destructors unnecessarily have in-charge parameters
+		   even in classes without vbases, map it to 0 for now.  */
+		gcc_assert (!CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun)));
+		ctx->global->put_value (remapped, integer_zero_node);
+	      }
+	    else
+	      {
+		gcc_assert (seen_error ());
+		*non_constant_p = true;
+	      }
 	  /* Add the RESULT_DECL to the values map, too.  */
 	  gcc_assert (!DECL_BY_REFERENCE (res));
 	  ctx->global->put_value (res, NULL_TREE);
-- 
2.39.3


  parent reply	other threads:[~2023-12-13 16:47 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-03  1:18 [PATCH] c++: End lifetime of objects in constexpr after destructor call [PR71093] Nathaniel Shead
2023-11-03  1:34 ` Nathaniel Shead
2023-11-27 11:08   ` Nathaniel Shead
2023-12-09 20:12 ` Jason Merrill
2023-12-10 10:22   ` Richard Biener
2023-12-10 11:21     ` Alexander Monakov
2023-12-10 15:58       ` Richard Biener
2023-12-10 18:34     ` Jason Merrill
2023-12-11  8:02       ` Richard Biener
2023-12-11 19:12         ` Jason Merrill
2023-12-11 19:17           ` Richard Biener
2023-12-11 19:21             ` Marek Polacek
2023-12-11 22:00               ` Jason Merrill
2023-12-11 22:22                 ` Marek Polacek
2023-12-11 23:03                 ` Jakub Jelinek
2023-12-12 11:13                   ` Alexander Monakov
2023-12-12 11:15                     ` Jakub Jelinek
2023-12-12 15:24                       ` Jason Merrill
2023-12-12 17:50                         ` Jason Merrill
2023-12-13  4:40                           ` Jason Merrill
2023-12-13 16:47                             ` [pushed 1/4] c++: copy location to AGGR_INIT_EXPR Jason Merrill
2023-12-13 16:47                               ` [pushed 2/4] c++: constant direct-initialization [PR108243] Jason Merrill
2023-12-13 16:47                               ` Jason Merrill [this message]
2023-12-13 16:47                               ` [pushed 4/4] c++: End lifetime of objects in constexpr after destructor call [PR71093] Jason Merrill
2023-12-13 18:05                               ` [pushed 1/4] c++: copy location to AGGR_INIT_EXPR Patrick Palka
2023-12-13 20:06                                 ` [pushed] c++: TARGET_EXPR location in default arg [PR96997] Jason Merrill
2023-12-14  0:00                               ` [pushed 1/4] c++: copy location to AGGR_INIT_EXPR Marek Polacek
2023-12-14  1:38                                 ` Jason Merrill
2023-12-14 14:25                                   ` Marek Polacek

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=20231213164740.1591535-3-jason@redhat.com \
    --to=jason@redhat.com \
    --cc=gcc-patches@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: link
Be 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).