Author: Kazu Hirata Date: 2023-03-15T18:06:34-07:00 New Revision: 7eaa7b055389799643cd6c2e992985f71de73ee5
URL: https://github.com/llvm/llvm-project/commit/7eaa7b055389799643cd6c2e992985f71de73ee5 DIFF: https://github.com/llvm/llvm-project/commit/7eaa7b055389799643cd6c2e992985f71de73ee5.diff LOG: [clang] Use *{Map,Set}::contains (NFC) Added: Modified: clang/include/clang/Analysis/FlowSensitive/DataflowAnalysisContext.h clang/lib/ARCMigrate/FileRemapper.cpp clang/lib/AST/Interp/ByteCodeExprGen.cpp clang/lib/ASTMatchers/Dynamic/Registry.cpp clang/lib/Analysis/CFG.cpp clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp clang/lib/Basic/Targets/AMDGPU.h clang/lib/CodeGen/CGExprConstant.cpp clang/lib/CodeGen/CGOpenCLRuntime.cpp clang/lib/Driver/OffloadBundler.cpp clang/lib/Format/FormatTokenSource.h clang/lib/Frontend/SerializedDiagnosticPrinter.cpp clang/lib/Serialization/ASTReader.cpp clang/lib/Serialization/ASTReaderDecl.cpp clang/lib/Serialization/ASTReaderStmt.cpp clang/lib/Serialization/ASTWriter.cpp clang/lib/Serialization/ASTWriterStmt.cpp clang/lib/StaticAnalyzer/Core/BugReporter.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysisContext.h b/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysisContext.h index 74748c8723ce8..970b17be224db 100644 --- a/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysisContext.h +++ b/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysisContext.h @@ -125,7 +125,7 @@ class DataflowAnalysisContext { /// /// `D` must not be assigned a storage location. void setStorageLocation(const ValueDecl &D, StorageLocation &Loc) { - assert(DeclToLoc.find(&D) == DeclToLoc.end()); + assert(!DeclToLoc.contains(&D)); DeclToLoc[&D] = &Loc; } @@ -143,7 +143,7 @@ class DataflowAnalysisContext { /// `E` must not be assigned a storage location. void setStorageLocation(const Expr &E, StorageLocation &Loc) { const Expr &CanonE = ignoreCFGOmittedNodes(E); - assert(ExprToLoc.find(&CanonE) == ExprToLoc.end()); + assert(!ExprToLoc.contains(&CanonE)); ExprToLoc[&CanonE] = &Loc; } diff --git a/clang/lib/ARCMigrate/FileRemapper.cpp b/clang/lib/ARCMigrate/FileRemapper.cpp index 92027fe4f1f4b..7e56e0683c129 100644 --- a/clang/lib/ARCMigrate/FileRemapper.cpp +++ b/clang/lib/ARCMigrate/FileRemapper.cpp @@ -251,8 +251,7 @@ const FileEntry *FileRemapper::getOriginalFile(StringRef filePath) { I = ToFromMappings.find(file); if (I != ToFromMappings.end()) { file = I->second; - assert(FromToMappings.find(file) != FromToMappings.end() && - "Original file not in mappings!"); + assert(FromToMappings.contains(file) && "Original file not in mappings!"); } return file; } diff --git a/clang/lib/AST/Interp/ByteCodeExprGen.cpp b/clang/lib/AST/Interp/ByteCodeExprGen.cpp index bc682c92c143f..0056da191765b 100644 --- a/clang/lib/AST/Interp/ByteCodeExprGen.cpp +++ b/clang/lib/AST/Interp/ByteCodeExprGen.cpp @@ -1139,7 +1139,7 @@ unsigned ByteCodeExprGen<Emitter>::allocateLocalPrimitive(DeclTy &&Src, if (const auto *VD = dyn_cast_if_present<ValueDecl>(Src.dyn_cast<const Decl *>())) { assert(!P.getGlobal(VD)); - assert(Locals.find(VD) == Locals.end()); + assert(!Locals.contains(VD)); } // FIXME: There are cases where Src.is<Expr*>() is wrong, e.g. @@ -1161,7 +1161,7 @@ ByteCodeExprGen<Emitter>::allocateLocal(DeclTy &&Src, bool IsExtended) { if (const auto *VD = dyn_cast_if_present<ValueDecl>(Src.dyn_cast<const Decl *>())) { assert(!P.getGlobal(VD)); - assert(Locals.find(VD) == Locals.end()); + assert(!Locals.contains(VD)); } QualType Ty; diff --git a/clang/lib/ASTMatchers/Dynamic/Registry.cpp b/clang/lib/ASTMatchers/Dynamic/Registry.cpp index 9bbb291df0639..37e1780e68a60 100644 --- a/clang/lib/ASTMatchers/Dynamic/Registry.cpp +++ b/clang/lib/ASTMatchers/Dynamic/Registry.cpp @@ -60,7 +60,7 @@ class RegistryMaps { void RegistryMaps::registerMatcher( StringRef MatcherName, std::unique_ptr<MatcherDescriptor> Callback) { - assert(Constructors.find(MatcherName) == Constructors.end()); + assert(!Constructors.contains(MatcherName)); Constructors[MatcherName] = std::move(Callback); } diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp index ea8b73e81ea24..7e93247ba83fc 100644 --- a/clang/lib/Analysis/CFG.cpp +++ b/clang/lib/Analysis/CFG.cpp @@ -3387,8 +3387,7 @@ CFGBlock *CFGBuilder::VisitLabelStmt(LabelStmt *L) { if (!LabelBlock) // This can happen when the body is empty, i.e. LabelBlock = createBlock(); // scopes that only contains NullStmts. - assert(LabelMap.find(L->getDecl()) == LabelMap.end() && - "label already in map"); + assert(!LabelMap.contains(L->getDecl()) && "label already in map"); LabelMap[L->getDecl()] = JumpTarget(LabelBlock, ScopePos); // Labels partition blocks, so this is the end of the basic block we were diff --git a/clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp b/clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp index 480606bdac8d8..44053246bb744 100644 --- a/clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp +++ b/clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp @@ -316,10 +316,9 @@ BoolValue &DataflowAnalysisContext::substituteBoolValue( BoolValue &DataflowAnalysisContext::buildAndSubstituteFlowCondition( AtomicBoolValue &Token, llvm::DenseMap<AtomicBoolValue *, BoolValue *> Substitutions) { - assert( - Substitutions.find(&getBoolLiteralValue(true)) == Substitutions.end() && - Substitutions.find(&getBoolLiteralValue(false)) == Substitutions.end() && - "Do not substitute true/false boolean literals"); + assert(!Substitutions.contains(&getBoolLiteralValue(true)) && + !Substitutions.contains(&getBoolLiteralValue(false)) && + "Do not substitute true/false boolean literals"); llvm::DenseMap<BoolValue *, BoolValue *> SubstitutionsCache( Substitutions.begin(), Substitutions.end()); return buildAndSubstituteFlowConditionWithCache(Token, SubstitutionsCache); diff --git a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp index 5d502fee30daf..46fb7bd2fd5e9 100644 --- a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp +++ b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp @@ -583,7 +583,7 @@ StorageLocation &Environment::createStorageLocation(const Expr &E) { } void Environment::setStorageLocation(const ValueDecl &D, StorageLocation &Loc) { - assert(DeclToLoc.find(&D) == DeclToLoc.end()); + assert(!DeclToLoc.contains(&D)); DeclToLoc[&D] = &Loc; } @@ -595,7 +595,7 @@ StorageLocation *Environment::getStorageLocation(const ValueDecl &D, void Environment::setStorageLocation(const Expr &E, StorageLocation &Loc) { const Expr &CanonE = ignoreCFGOmittedNodes(E); - assert(ExprToLoc.find(&CanonE) == ExprToLoc.end()); + assert(!ExprToLoc.contains(&CanonE)); ExprToLoc[&CanonE] = &Loc; } diff --git a/clang/lib/Basic/Targets/AMDGPU.h b/clang/lib/Basic/Targets/AMDGPU.h index e315e6f033a21..ab8482b3df9a6 100644 --- a/clang/lib/Basic/Targets/AMDGPU.h +++ b/clang/lib/Basic/Targets/AMDGPU.h @@ -447,7 +447,7 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUTargetInfo final : public TargetInfo { StringRef Name = StringRef(F).drop_front(); if (!llvm::is_contained(TargetIDFeatures, Name)) continue; - assert(OffloadArchFeatures.find(Name) == OffloadArchFeatures.end()); + assert(!OffloadArchFeatures.contains(Name)); OffloadArchFeatures[Name] = IsOn; } return true; diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp index c38feaaca35a1..9a90752fa28a6 100644 --- a/clang/lib/CodeGen/CGExprConstant.cpp +++ b/clang/lib/CodeGen/CGExprConstant.cpp @@ -1570,7 +1570,7 @@ namespace { } void setLocation(llvm::GlobalVariable *placeholder) { - assert(Locations.find(placeholder) == Locations.end() && + assert(!Locations.contains(placeholder) && "already found location for placeholder!"); // Lazily fill in IndexValues with the values from Indices. diff --git a/clang/lib/CodeGen/CGOpenCLRuntime.cpp b/clang/lib/CodeGen/CGOpenCLRuntime.cpp index 395ba5e7dc144..dc2330a299762 100644 --- a/clang/lib/CodeGen/CGOpenCLRuntime.cpp +++ b/clang/lib/CodeGen/CGOpenCLRuntime.cpp @@ -161,8 +161,7 @@ static const BlockExpr *getBlockExpr(const Expr *E) { void CGOpenCLRuntime::recordBlockInfo(const BlockExpr *E, llvm::Function *InvokeF, llvm::Value *Block, llvm::Type *BlockTy) { - assert(EnqueuedBlockMap.find(E) == EnqueuedBlockMap.end() && - "Block expression emitted twice"); + assert(!EnqueuedBlockMap.contains(E) && "Block expression emitted twice"); assert(isa<llvm::Function>(InvokeF) && "Invalid invoke function"); assert(Block->getType()->isPointerTy() && "Invalid block literal type"); EnqueuedBlockMap[E].InvokeFunc = InvokeF; @@ -183,8 +182,7 @@ CGOpenCLRuntime::emitOpenCLEnqueuedBlock(CodeGenFunction &CGF, const Expr *E) { // to get the block literal. const BlockExpr *Block = getBlockExpr(E); - assert(EnqueuedBlockMap.find(Block) != EnqueuedBlockMap.end() && - "Block expression not emitted"); + assert(EnqueuedBlockMap.contains(Block) && "Block expression not emitted"); // Do not emit the block wrapper again if it has been emitted. if (EnqueuedBlockMap[Block].KernelHandle) { diff --git a/clang/lib/Driver/OffloadBundler.cpp b/clang/lib/Driver/OffloadBundler.cpp index c8c50c94fee03..5163eb37c78c9 100644 --- a/clang/lib/Driver/OffloadBundler.cpp +++ b/clang/lib/Driver/OffloadBundler.cpp @@ -405,8 +405,7 @@ class BinaryFileHandler final : public FileHandler { if (!Offset || Offset + Size > FC.size()) return Error::success(); - assert(BundlesInfo.find(Triple) == BundlesInfo.end() && - "Triple is duplicated??"); + assert(!BundlesInfo.contains(Triple) && "Triple is duplicated??"); BundlesInfo[Triple] = BinaryBundleInfo(Size, Offset); } // Set the iterator to where we will start to read. diff --git a/clang/lib/Format/FormatTokenSource.h b/clang/lib/Format/FormatTokenSource.h index d93efaf676087..ffd2fbbad02ff 100644 --- a/clang/lib/Format/FormatTokenSource.h +++ b/clang/lib/Format/FormatTokenSource.h @@ -162,7 +162,7 @@ class IndexedTokenSource : public FormatTokenSource { auto it = Jumps.find(Next); if (it != Jumps.end()) { Next = it->second; - assert(Jumps.find(Next) == Jumps.end()); + assert(!Jumps.contains(Next)); } return Next; } diff --git a/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp b/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp index fc8fce4b42b85..b76728acb9077 100644 --- a/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp +++ b/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp @@ -37,14 +37,12 @@ class AbbreviationMap { AbbreviationMap() {} void set(unsigned recordID, unsigned abbrevID) { - assert(Abbrevs.find(recordID) == Abbrevs.end() - && "Abbreviation already set."); + assert(!Abbrevs.contains(recordID) && "Abbreviation already set."); Abbrevs[recordID] = abbrevID; } unsigned get(unsigned recordID) { - assert(Abbrevs.find(recordID) != Abbrevs.end() && - "Abbreviation not set."); + assert(Abbrevs.contains(recordID) && "Abbreviation not set."); return Abbrevs[recordID]; } }; diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 96ca312e7cbdf..0273fa1b839a5 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -4134,7 +4134,7 @@ void ASTReader::makeModuleVisible(Module *Mod, auto HiddenNames = std::move(*Hidden); HiddenNamesMap.erase(Hidden); makeNamesVisible(HiddenNames.second, HiddenNames.first); - assert(HiddenNamesMap.find(Mod) == HiddenNamesMap.end() && + assert(!HiddenNamesMap.contains(Mod) && "making names visible added hidden names"); } diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index b9bbc0ec9eb28..1c449bc71bfd8 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -1977,7 +1977,7 @@ void ASTDeclReader::MergeDefinitionData( Reader.PendingDefinitions.erase(MergeDD.Definition); MergeDD.Definition->setCompleteDefinition(false); Reader.mergeDefinitionVisibility(DD.Definition, MergeDD.Definition); - assert(Reader.Lookups.find(MergeDD.Definition) == Reader.Lookups.end() && + assert(!Reader.Lookups.contains(MergeDD.Definition) && "already loaded pending lookups for merged definition"); } diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp index 46d653c7f9407..56b30d1314dc3 100644 --- a/clang/lib/Serialization/ASTReaderStmt.cpp +++ b/clang/lib/Serialization/ASTReaderStmt.cpp @@ -2805,7 +2805,7 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) { case STMT_REF_PTR: IsStmtReference = true; - assert(StmtEntries.find(Record[0]) != StmtEntries.end() && + assert(StmtEntries.contains(Record[0]) && "No stmt was recorded for this offset reference!"); S = StmtEntries[Record.readInt()]; break; diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index c1afdeb6007db..f5691e99241c1 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -5109,7 +5109,7 @@ ASTFileSignature ASTWriter::WriteASTCore(Sema &SemaRef, StringRef isysroot, }; llvm::SmallVector<ModuleInfo, 64> Imports; for (const auto *I : Context.local_imports()) { - assert(SubmoduleIDs.find(I->getImportedModule()) != SubmoduleIDs.end()); + assert(SubmoduleIDs.contains(I->getImportedModule())); Imports.push_back(ModuleInfo(SubmoduleIDs[I->getImportedModule()], I->getImportedModule())); } @@ -5457,7 +5457,7 @@ MacroID ASTWriter::getMacroID(MacroInfo *MI) { if (!MI || MI->isBuiltinMacro()) return 0; - assert(MacroIDs.find(MI) != MacroIDs.end() && "Macro not emitted!"); + assert(MacroIDs.contains(MI) && "Macro not emitted!"); return MacroIDs[MI]; } @@ -5632,7 +5632,7 @@ DeclID ASTWriter::getDeclID(const Decl *D) { if (D->isFromASTFile()) return D->getGlobalID(); - assert(DeclIDs.find(D) != DeclIDs.end() && "Declaration not emitted!"); + assert(DeclIDs.contains(D) && "Declaration not emitted!"); return DeclIDs[D]; } @@ -6057,12 +6057,12 @@ void ASTWriter::SelectorRead(SelectorID ID, Selector S) { void ASTWriter::MacroDefinitionRead(serialization::PreprocessedEntityID ID, MacroDefinitionRecord *MD) { - assert(MacroDefinitions.find(MD) == MacroDefinitions.end()); + assert(!MacroDefinitions.contains(MD)); MacroDefinitions[MD] = ID; } void ASTWriter::ModuleRead(serialization::SubmoduleID ID, Module *Mod) { - assert(SubmoduleIDs.find(Mod) == SubmoduleIDs.end()); + assert(!SubmoduleIDs.contains(Mod)); SubmoduleIDs[Mod] = ID; } diff --git a/clang/lib/Serialization/ASTWriterStmt.cpp b/clang/lib/Serialization/ASTWriterStmt.cpp index b35a7cee5af20..37e0e3f60719f 100644 --- a/clang/lib/Serialization/ASTWriterStmt.cpp +++ b/clang/lib/Serialization/ASTWriterStmt.cpp @@ -2698,16 +2698,14 @@ void ASTStmtWriter::VisitOMPTargetParallelGenericLoopDirective( //===----------------------------------------------------------------------===// unsigned ASTWriter::RecordSwitchCaseID(SwitchCase *S) { - assert(SwitchCaseIDs.find(S) == SwitchCaseIDs.end() && - "SwitchCase recorded twice"); + assert(!SwitchCaseIDs.contains(S) && "SwitchCase recorded twice"); unsigned NextID = SwitchCaseIDs.size(); SwitchCaseIDs[S] = NextID; return NextID; } unsigned ASTWriter::getSwitchCaseID(SwitchCase *S) { - assert(SwitchCaseIDs.find(S) != SwitchCaseIDs.end() && - "SwitchCase hasn't been seen yet"); + assert(SwitchCaseIDs.contains(S) && "SwitchCase hasn't been seen yet"); return SwitchCaseIDs[S]; } diff --git a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp index c3bd4876faf2a..5b79e5d486286 100644 --- a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp +++ b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp @@ -2627,8 +2627,7 @@ BugPathInfo *BugPathGetter::getNextBugPath() { const ExplodedNode *OrigN; std::tie(CurrentBugPath.Report, OrigN) = ReportNodes.pop_back_val(); - assert(PriorityMap.find(OrigN) != PriorityMap.end() && - "error node not accessible from root"); + assert(PriorityMap.contains(OrigN) && "error node not accessible from root"); // Create a new graph with a single path. This is the graph that will be // returned to the caller. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
