* [pushed] c++: use hash_set in nrv_data
@ 2023-11-02 20:01 Jason Merrill
0 siblings, 0 replies; only message in thread
From: Jason Merrill @ 2023-11-02 20:01 UTC (permalink / raw)
To: gcc-patches
Tested x86_64-pc-linux-gnu, applying to trunk.
-- 8< --
I noticed we were using a hash_table directly here instead of the simpler
hash_set interface. Also, let's check for the variable itself and repeats
earlier, since they should happen more often than any of the other cases.
gcc/cp/ChangeLog:
* semantics.cc (nrv_data): Change visited to hash_set.
(finalize_nrv_r): Reorganize.
---
gcc/cp/semantics.cc | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index a0f2edcf117..37bffca8e55 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -4980,7 +4980,7 @@ public:
tree var;
tree result;
- hash_table<nofree_ptr_hash <tree_node> > visited;
+ hash_set<tree> visited;
bool simple;
bool in_nrv_cleanup;
};
@@ -4991,12 +4991,22 @@ static tree
finalize_nrv_r (tree* tp, int* walk_subtrees, void* data)
{
class nrv_data *dp = (class nrv_data *)data;
- tree_node **slot;
/* No need to walk into types. There wouldn't be any need to walk into
non-statements, except that we have to consider STMT_EXPRs. */
if (TYPE_P (*tp))
*walk_subtrees = 0;
+
+ /* Replace all uses of the NRV with the RESULT_DECL. */
+ else if (*tp == dp->var)
+ *tp = dp->result;
+
+ /* Avoid walking into the same tree more than once. Unfortunately, we
+ can't just use walk_tree_without duplicates because it would only call
+ us for the first occurrence of dp->var in the function body. */
+ else if (dp->visited.add (*tp))
+ *walk_subtrees = 0;
+
/* If there's a label, we might need to destroy the NRV on goto (92407). */
else if (TREE_CODE (*tp) == LABEL_EXPR && !dp->in_nrv_cleanup)
dp->simple = false;
@@ -5086,18 +5096,6 @@ finalize_nrv_r (tree* tp, int* walk_subtrees, void* data)
SET_EXPR_LOCATION (init, EXPR_LOCATION (*tp));
*tp = init;
}
- /* And replace all uses of the NRV with the RESULT_DECL. */
- else if (*tp == dp->var)
- *tp = dp->result;
-
- /* Avoid walking into the same tree more than once. Unfortunately, we
- can't just use walk_tree_without duplicates because it would only call
- us for the first occurrence of dp->var in the function body. */
- slot = dp->visited.find_slot (*tp, INSERT);
- if (*slot)
- *walk_subtrees = 0;
- else
- *slot = *tp;
/* Keep iterating. */
return NULL_TREE;
base-commit: 36a26298ec7dfca615d4ba411a3508d1287d6ce5
--
2.39.3
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-11-02 20:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-02 20:01 [pushed] c++: use hash_set in nrv_data Jason Merrill
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).