[Clang][NFC] Remove duplicated specialization of llvm::DenseMapInfo<llvm::FoldingSetNodeID>
#159718
+21
−48
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Corentin Jabot (cor3ntin) ChangesIn preparation of #141776 Full diff: https://github.com/llvm/llvm-project/pull/159718.diff 3 Files Affected:
diff --git a/clang/include/clang/AST/ASTContext.h b/clang/include/clang/AST/ASTContext.h
index b8f6de69bbb98..1bb9de70008b7 100644
--- a/clang/include/clang/AST/ASTContext.h
+++ b/clang/include/clang/AST/ASTContext.h
@@ -3843,4 +3843,25 @@ typename clang::LazyGenerationalUpdatePtr<Owner, T, Update>::ValueType
return Value;
}
+template <> struct llvm::DenseMapInfo<llvm::FoldingSetNodeID> {
+ static FoldingSetNodeID getEmptyKey() { return FoldingSetNodeID{}; }
+
+ static FoldingSetNodeID getTombstoneKey() {
+ FoldingSetNodeID ID;
+ for (size_t i = 0; i < sizeof(ID) / sizeof(unsigned); ++i) {
+ ID.AddInteger(std::numeric_limits<unsigned>::max());
+ }
+ return ID;
+ }
+
+ static unsigned getHashValue(const FoldingSetNodeID &Val) {
+ return Val.ComputeHash();
+ }
+
+ static bool isEqual(const FoldingSetNodeID &LHS,
+ const FoldingSetNodeID &RHS) {
+ return LHS == RHS;
+ }
+};
+
#endif // LLVM_CLANG_AST_ASTCONTEXT_H
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 5240054c2f36b..e49ff9080571e 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -114,27 +114,6 @@ enum FloatingRank {
Ibm128Rank
};
-template <> struct llvm::DenseMapInfo<llvm::FoldingSetNodeID> {
- static FoldingSetNodeID getEmptyKey() { return FoldingSetNodeID{}; }
-
- static FoldingSetNodeID getTombstoneKey() {
- FoldingSetNodeID id;
- for (size_t i = 0; i < sizeof(id) / sizeof(unsigned); ++i) {
- id.AddInteger(std::numeric_limits<unsigned>::max());
- }
- return id;
- }
-
- static unsigned getHashValue(const FoldingSetNodeID &Val) {
- return Val.ComputeHash();
- }
-
- static bool isEqual(const FoldingSetNodeID &LHS,
- const FoldingSetNodeID &RHS) {
- return LHS == RHS;
- }
-};
-
/// \returns The locations that are relevant when searching for Doc comments
/// related to \p D.
static SmallVector<SourceLocation, 2>
diff --git a/clang/lib/Sema/SemaConcept.cpp b/clang/lib/Sema/SemaConcept.cpp
index f114173a42c21..d238b7916a330 100644
--- a/clang/lib/Sema/SemaConcept.cpp
+++ b/clang/lib/Sema/SemaConcept.cpp
@@ -1864,33 +1864,6 @@ NormalizedConstraint::getFoldExpandedConstraint() const {
// ------------------------ Subsumption -----------------------------------
//
//
-
-template <> struct llvm::DenseMapInfo<llvm::FoldingSetNodeID> {
-
- static FoldingSetNodeID getEmptyKey() {
- FoldingSetNodeID ID;
- ID.AddInteger(std::numeric_limits<unsigned>::max());
- return ID;
- }
-
- static FoldingSetNodeID getTombstoneKey() {
- FoldingSetNodeID ID;
- for (unsigned I = 0; I < sizeof(ID) / sizeof(unsigned); ++I) {
- ID.AddInteger(std::numeric_limits<unsigned>::max());
- }
- return ID;
- }
-
- static unsigned getHashValue(const FoldingSetNodeID &Val) {
- return Val.ComputeHash();
- }
-
- static bool isEqual(const FoldingSetNodeID &LHS,
- const FoldingSetNodeID &RHS) {
- return LHS == RHS;
- }
-};
-
SubsumptionChecker::SubsumptionChecker(Sema &SemaRef,
SubsumptionCallable Callable)
: SemaRef(SemaRef), Callable(Callable), NextID(1) {}
|
tbaederr
reviewed
Sep 19, 2025
clang/include/clang/AST/ASTContext.h
Outdated
There was a problem hiding this comment.
Suggested change
| for (size_t i = 0; i < sizeof(ID) / sizeof(unsigned); ++i) { | |
| for (size_t I = 0; I != sizeof(ID) / sizeof(unsigned); ++I) { |
…llvm::FoldingSetNodeID>` In preparation of llvm#141776
cor3ntin
force-pushed
the
corentin/move_dense_map
branch
from
de3b12c to
13e53f8
Compare
zyn0217
reviewed
Sep 19, 2025
Comment on lines
+3850
to
+3854
| FoldingSetNodeID ID; | ||
| for (size_t I = 0; I < sizeof(ID) / sizeof(unsigned); ++I) { | ||
| ID.AddInteger(std::numeric_limits<unsigned>::max()); | ||
| } | ||
| return ID; |
There was a problem hiding this comment.
I was about to say ID can probably be static (constexpr if possible?)...
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/27/builds/16285 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In preparation of #141776