[clang] Use *(Set|Map)::contains (NFC) #138464
Merged
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
|
@llvm/pr-subscribers-clang-modules Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/138464.diff 4 Files Affected:
diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index fead99c5f28a9..aea19c51401aa 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -2149,8 +2149,7 @@ void DeclContext::makeDeclVisibleInContextImpl(NamedDecl *D, bool Internal) {
// have already checked the external source.
if (!Internal)
if (ExternalASTSource *Source = getParentASTContext().getExternalSource())
- if (hasExternalVisibleStorage() &&
- Map->find(D->getDeclName()) == Map->end())
+ if (hasExternalVisibleStorage() && !Map->contains(D->getDeclName()))
Source->FindExternalVisibleDeclsByName(this, D->getDeclName(),
D->getDeclContext());
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 106a652049b07..e47bac0261356 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -8646,9 +8646,8 @@ ASTReader::getLoadedSpecializationsLookupTables(const Decl *D, bool IsPartial) {
bool ASTReader::haveUnloadedSpecializations(const Decl *D) const {
assert(D->isCanonicalDecl());
- return (PartialSpecializationsLookups.find(D) !=
- PartialSpecializationsLookups.end()) ||
- (SpecializationsLookups.find(D) != SpecializationsLookups.end());
+ return PartialSpecializationsLookups.contains(D) ||
+ SpecializationsLookups.contains(D);
}
/// Under non-PCH compilation the consumer receives the objc methods
diff --git a/clang/tools/libclang/CXCursor.cpp b/clang/tools/libclang/CXCursor.cpp
index 1d15120106017..635d03a88d105 100644
--- a/clang/tools/libclang/CXCursor.cpp
+++ b/clang/tools/libclang/CXCursor.cpp
@@ -1638,7 +1638,7 @@ unsigned clang_CXCursorSet_contains(CXCursorSet set, CXCursor cursor) {
CXCursorSet_Impl *setImpl = unpackCXCursorSet(set);
if (!setImpl)
return 0;
- return setImpl->find(cursor) != setImpl->end();
+ return setImpl->contains(cursor);
}
unsigned clang_CXCursorSet_insert(CXCursorSet set, CXCursor cursor) {
diff --git a/clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp b/clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp
index de79743a06e1f..e2eb65091bc5a 100644
--- a/clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp
+++ b/clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp
@@ -60,10 +60,8 @@ ParseTemplateParameterList(ParserState &PS,
} else if (Arg->isSubClassOf("NTTP")) {
auto Type = Arg->getValueAsString("TypeName");
- if (TemplateNameToParmName.find(Type.str()) ==
- TemplateNameToParmName.end()) {
+ if (!TemplateNameToParmName.contains(Type.str()))
PrintFatalError("Unkown Type Name");
- }
auto TSIName = "TSI" + std::to_string(PS.UniqueCounter++);
Code << " auto *" << TSIName << " = C.getTrivialTypeSourceInfo(QualType("
|
|
@llvm/pr-subscribers-clang Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/138464.diff 4 Files Affected:
diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index fead99c5f28a9..aea19c51401aa 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -2149,8 +2149,7 @@ void DeclContext::makeDeclVisibleInContextImpl(NamedDecl *D, bool Internal) {
// have already checked the external source.
if (!Internal)
if (ExternalASTSource *Source = getParentASTContext().getExternalSource())
- if (hasExternalVisibleStorage() &&
- Map->find(D->getDeclName()) == Map->end())
+ if (hasExternalVisibleStorage() && !Map->contains(D->getDeclName()))
Source->FindExternalVisibleDeclsByName(this, D->getDeclName(),
D->getDeclContext());
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 106a652049b07..e47bac0261356 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -8646,9 +8646,8 @@ ASTReader::getLoadedSpecializationsLookupTables(const Decl *D, bool IsPartial) {
bool ASTReader::haveUnloadedSpecializations(const Decl *D) const {
assert(D->isCanonicalDecl());
- return (PartialSpecializationsLookups.find(D) !=
- PartialSpecializationsLookups.end()) ||
- (SpecializationsLookups.find(D) != SpecializationsLookups.end());
+ return PartialSpecializationsLookups.contains(D) ||
+ SpecializationsLookups.contains(D);
}
/// Under non-PCH compilation the consumer receives the objc methods
diff --git a/clang/tools/libclang/CXCursor.cpp b/clang/tools/libclang/CXCursor.cpp
index 1d15120106017..635d03a88d105 100644
--- a/clang/tools/libclang/CXCursor.cpp
+++ b/clang/tools/libclang/CXCursor.cpp
@@ -1638,7 +1638,7 @@ unsigned clang_CXCursorSet_contains(CXCursorSet set, CXCursor cursor) {
CXCursorSet_Impl *setImpl = unpackCXCursorSet(set);
if (!setImpl)
return 0;
- return setImpl->find(cursor) != setImpl->end();
+ return setImpl->contains(cursor);
}
unsigned clang_CXCursorSet_insert(CXCursorSet set, CXCursor cursor) {
diff --git a/clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp b/clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp
index de79743a06e1f..e2eb65091bc5a 100644
--- a/clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp
+++ b/clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp
@@ -60,10 +60,8 @@ ParseTemplateParameterList(ParserState &PS,
} else if (Arg->isSubClassOf("NTTP")) {
auto Type = Arg->getValueAsString("TypeName");
- if (TemplateNameToParmName.find(Type.str()) ==
- TemplateNameToParmName.end()) {
+ if (!TemplateNameToParmName.contains(Type.str()))
PrintFatalError("Unkown Type Name");
- }
auto TSIName = "TSI" + std::to_string(PS.UniqueCounter++);
Code << " auto *" << TSIName << " = C.getTrivialTypeSourceInfo(QualType("
|
arsenm
approved these changes
May 4, 2025
steakhal
approved these changes
May 4, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.