From: Alexandre Oliva <oliva@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Jason Merrill <jason@redhat.com>, Nathan Sidwell <nathan@acm.org>
Subject: [09/13] [C++] constexpr: request insert iff depth is ok
Date: Tue, 27 Dec 2022 01:30:00 -0300 [thread overview]
Message-ID: <orzgb9eaev.fsf@lxoliva.fsfla.org> (raw)
In-Reply-To: <or5ydxh4l4.fsf@lxoliva.fsfla.org> (Alexandre Oliva's message of "Tue, 27 Dec 2022 01:07:35 -0300")
cxx_eval_call_expression requests an INSERT even in cases when it
would later decide not to insert. This could break double-hashing
chains. Arrange for it to use NO_INSERT when the insertion would not
be completed.
Regstrapped on x86_64-linux-gnu. Ok to install?
for gcc/cp/ChangeLog
* constexpr.cc (cxx_eval_call_expression): Do not request an
INSERT that would not be completed.
---
gcc/cp/constexpr.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc
index d99c49bdbe282..6d20ffa2cdeb6 100644
--- a/gcc/cp/constexpr.cc
+++ b/gcc/cp/constexpr.cc
@@ -3000,13 +3000,15 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
/* If we have seen this call before, we are done. */
maybe_initialize_constexpr_call_table ();
+ bool insert = depth_ok < constexpr_cache_depth;
constexpr_call **slot
- = constexpr_call_table->find_slot (&new_call, INSERT);
- entry = *slot;
+ = constexpr_call_table->find_slot (&new_call,
+ insert ? INSERT : NO_INSERT);
+ entry = slot ? *slot : NULL;
if (entry == NULL)
{
/* Only cache up to constexpr_cache_depth to limit memory use. */
- if (depth_ok < constexpr_cache_depth)
+ if (insert)
{
/* We need to keep a pointer to the entry, not just the slot, as
the slot can move during evaluation of the body. */
--
Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/
Free Software Activist GNU Toolchain Engineer
Disinformation flourishes because many people care deeply about injustice
but very few check the facts. Ask me about <https://stallmansupport.org>
next prev parent reply other threads:[~2022-12-27 4:30 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-27 4:07 [00/13] check hash table counts Alexandre Oliva
2022-12-27 4:17 ` [01/13] scoped tables: insert before further lookups Alexandre Oliva
2022-12-27 15:11 ` Jeff Law
2022-12-27 4:18 ` [02/13] varpool: do not add NULL vnodes to referenced Alexandre Oliva
2022-12-27 15:14 ` Jeff Law
2022-12-27 4:19 ` [03/13] tree-inline decl_map: skip mapping NULL to itself Alexandre Oliva
2022-12-27 15:15 ` Jeff Law
2022-12-27 4:21 ` [04/13] [C++] constraint: insert norm entry once Alexandre Oliva
2022-12-27 15:37 ` Jeff Law
2022-12-27 4:22 ` [05/13] ssa-loop-niter: skip caching of null operands Alexandre Oliva
2022-12-27 15:19 ` Jeff Law
2022-12-28 4:03 ` Alexandre Oliva
2022-12-27 4:23 ` [06/13] tree-inline decl_map: skip mapping result's NULL default def Alexandre Oliva
2022-12-27 15:23 ` Jeff Law
2022-12-27 4:24 ` [07/13] postreload-gcse: no insert on mere lookup Alexandre Oliva
2022-12-27 15:11 ` Jeff Law
2022-12-27 4:28 ` [08/13] tm: complete tm_restart insertion Alexandre Oliva
2022-12-27 15:27 ` Jeff Law
2022-12-27 4:30 ` Alexandre Oliva [this message]
2022-12-27 15:38 ` [09/13] [C++] constexpr: request insert iff depth is ok Jeff Law
2022-12-27 4:35 ` [10/13] lto: drop dummy partition mapping Alexandre Oliva
2022-12-27 15:34 ` Jeff Law
2022-12-27 4:38 ` [11/13] ada: don't map NULL decl to locus Alexandre Oliva
2022-12-27 15:33 ` Jeff Law
2022-12-27 16:54 ` Arnaud Charlet
2022-12-27 4:38 ` [12/13] hash set: reject attempts to add empty values Alexandre Oliva
2022-12-27 15:30 ` Jeff Law
2022-12-27 4:39 ` [13/13] hash-map: reject empty-looking insertions Alexandre Oliva
2022-12-27 15:31 ` Jeff Law
2022-12-27 17:53 ` David Malcolm
2022-12-28 12:32 ` [15/17] prevent hash set/map insertion of deleted entries Alexandre Oliva
2022-12-29 4:25 ` Jeff Law
2022-12-28 8:50 ` [00/13] check hash table counts Martin Liška
2022-12-28 12:46 ` [16/17] check hash table counts at expand Alexandre Oliva
2023-01-09 7:46 ` Richard Biener
2022-12-28 12:30 ` [14/17] parloops: don't request insert that won't be completed Alexandre Oliva
2022-12-29 2:44 ` Jeff Law
2022-12-28 12:50 ` [17/17] check hash table insertions Alexandre Oliva
2022-12-28 14:20 ` Richard Biener
2022-12-28 23:06 ` Alexandre Oliva
2022-12-29 7:29 ` Richard Biener
2022-12-30 8:53 ` Alexandre Oliva
2022-12-30 11:30 ` Richard Biener
2022-12-30 16:41 ` Alexandre Oliva
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=orzgb9eaev.fsf@lxoliva.fsfla.org \
--to=oliva@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
--cc=nathan@acm.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).