public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/aoliva/heads/testme)] [C++] constraint: insert norm entry once
@ 2022-12-23 0:58 Alexandre Oliva
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Oliva @ 2022-12-23 0:58 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:ff6ccdebd02c42840a19922ec5a3accab8b62d84
commit ff6ccdebd02c42840a19922ec5a3accab8b62d84
Author: Alexandre Oliva <oliva@gnu.org>
Date: Thu Dec 22 21:28:51 2022 -0300
[C++] constraint: insert norm entry once
Diff:
---
gcc/cp/constraint.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 37eae03afdb..f28f96ada46 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -777,14 +777,16 @@ normalize_concept_check (tree check, tree args, norm_info info)
norm_entry entry = {tmpl, targs, NULL_TREE};
norm_entry **slot = nullptr;
hashval_t hash = 0;
+ bool insert = false;
if (!info.generate_diagnostics ())
{
/* Cache the normal form of the substituted concept-id (when not
diagnosing). */
hash = norm_hasher::hash (&entry);
- slot = norm_cache->find_slot_with_hash (&entry, hash, INSERT);
- if (*slot)
+ slot = norm_cache->find_slot_with_hash (&entry, hash, NO_INSERT);
+ if (slot)
return (*slot)->norm;
+ insert = true;
}
/* The concept may have been ill-formed. */
@@ -794,7 +796,7 @@ normalize_concept_check (tree check, tree args, norm_info info)
info.update_context (check, args);
tree norm = normalize_expression (def, targs, info);
- if (slot)
+ if (insert)
{
/* Recompute SLOT since norm_cache may have been expanded during
the recursive call. */
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gcc(refs/users/aoliva/heads/testme)] [C++] constraint: insert norm entry once
@ 2022-12-28 5:23 Alexandre Oliva
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Oliva @ 2022-12-28 5:23 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:49cc30b889ba0d19c975d1709d456ee987051008
commit 49cc30b889ba0d19c975d1709d456ee987051008
Author: Alexandre Oliva <oliva@adacore.com>
Date: Wed Dec 28 02:21:32 2022 -0300
[C++] constraint: insert norm entry once
Use NO_INSERT to test whether inserting should be attempted.
for gcc/cp/ChangeLog
* constraint.cc (normalize_concept_check): Use NO_INSERT for
pre-insertion check.
Diff:
---
gcc/cp/constraint.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 247a8278d40..4edc0846dc1 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -777,14 +777,16 @@ normalize_concept_check (tree check, tree args, norm_info info)
norm_entry entry = {tmpl, targs, NULL_TREE};
norm_entry **slot = nullptr;
hashval_t hash = 0;
+ bool insert = false;
if (!info.generate_diagnostics ())
{
/* Cache the normal form of the substituted concept-id (when not
diagnosing). */
hash = norm_hasher::hash (&entry);
- slot = norm_cache->find_slot_with_hash (&entry, hash, INSERT);
- if (*slot)
+ slot = norm_cache->find_slot_with_hash (&entry, hash, NO_INSERT);
+ if (slot)
return (*slot)->norm;
+ insert = true;
}
/* The concept may have been ill-formed. */
@@ -794,7 +796,7 @@ normalize_concept_check (tree check, tree args, norm_info info)
info.update_context (check, args);
tree norm = normalize_expression (def, targs, info);
- if (slot)
+ if (insert)
{
/* Recompute SLOT since norm_cache may have been expanded during
the recursive call. */
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gcc(refs/users/aoliva/heads/testme)] [C++] constraint: insert norm entry once
@ 2022-12-23 7:31 Alexandre Oliva
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Oliva @ 2022-12-23 7:31 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:eec9a98a337079636be2b8a9d39384e0395c3e23
commit eec9a98a337079636be2b8a9d39384e0395c3e23
Author: Alexandre Oliva <oliva@gnu.org>
Date: Thu Dec 22 21:28:51 2022 -0300
[C++] constraint: insert norm entry once
Diff:
---
gcc/cp/constraint.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 37eae03afdb..f28f96ada46 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -777,14 +777,16 @@ normalize_concept_check (tree check, tree args, norm_info info)
norm_entry entry = {tmpl, targs, NULL_TREE};
norm_entry **slot = nullptr;
hashval_t hash = 0;
+ bool insert = false;
if (!info.generate_diagnostics ())
{
/* Cache the normal form of the substituted concept-id (when not
diagnosing). */
hash = norm_hasher::hash (&entry);
- slot = norm_cache->find_slot_with_hash (&entry, hash, INSERT);
- if (*slot)
+ slot = norm_cache->find_slot_with_hash (&entry, hash, NO_INSERT);
+ if (slot)
return (*slot)->norm;
+ insert = true;
}
/* The concept may have been ill-formed. */
@@ -794,7 +796,7 @@ normalize_concept_check (tree check, tree args, norm_info info)
info.update_context (check, args);
tree norm = normalize_expression (def, targs, info);
- if (slot)
+ if (insert)
{
/* Recompute SLOT since norm_cache may have been expanded during
the recursive call. */
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gcc(refs/users/aoliva/heads/testme)] [C++] constraint: insert norm entry once
@ 2022-12-23 5:27 Alexandre Oliva
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Oliva @ 2022-12-23 5:27 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:34f02f9ee78641ddfb4f750bc23ffa8570964f21
commit 34f02f9ee78641ddfb4f750bc23ffa8570964f21
Author: Alexandre Oliva <oliva@gnu.org>
Date: Thu Dec 22 21:28:51 2022 -0300
[C++] constraint: insert norm entry once
Diff:
---
gcc/cp/constraint.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 37eae03afdb..f28f96ada46 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -777,14 +777,16 @@ normalize_concept_check (tree check, tree args, norm_info info)
norm_entry entry = {tmpl, targs, NULL_TREE};
norm_entry **slot = nullptr;
hashval_t hash = 0;
+ bool insert = false;
if (!info.generate_diagnostics ())
{
/* Cache the normal form of the substituted concept-id (when not
diagnosing). */
hash = norm_hasher::hash (&entry);
- slot = norm_cache->find_slot_with_hash (&entry, hash, INSERT);
- if (*slot)
+ slot = norm_cache->find_slot_with_hash (&entry, hash, NO_INSERT);
+ if (slot)
return (*slot)->norm;
+ insert = true;
}
/* The concept may have been ill-formed. */
@@ -794,7 +796,7 @@ normalize_concept_check (tree check, tree args, norm_info info)
info.update_context (check, args);
tree norm = normalize_expression (def, targs, info);
- if (slot)
+ if (insert)
{
/* Recompute SLOT since norm_cache may have been expanded during
the recursive call. */
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-28 5:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-23 0:58 [gcc(refs/users/aoliva/heads/testme)] [C++] constraint: insert norm entry once Alexandre Oliva
2022-12-23 5:27 Alexandre Oliva
2022-12-23 7:31 Alexandre Oliva
2022-12-28 5:23 Alexandre Oliva
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).