Author: Kazu Hirata Date: 2025-05-04T11:56:31-07:00 New Revision: 4c587f549cbbea0ac1db2b983b8c5fb4fff82d72
URL: https://github.com/llvm/llvm-project/commit/4c587f549cbbea0ac1db2b983b8c5fb4fff82d72 DIFF: https://github.com/llvm/llvm-project/commit/4c587f549cbbea0ac1db2b983b8c5fb4fff82d72.diff LOG: [clang] Use *(Set|Map)::contains (NFC) (#138464) Added: Modified: clang/lib/AST/DeclBase.cpp clang/lib/Serialization/ASTReader.cpp clang/tools/libclang/CXCursor.cpp clang/utils/TableGen/ClangBuiltinTemplatesEmitter.cpp Removed: ################################################################################ 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(" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
