[llvm] 398af9b - [llvm] Use *{Map,Set}::contains (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 15 18:06:49 PDT 2023
Author: Kazu Hirata
Date: 2023-03-15T18:06:32-07:00
New Revision: 398af9b43bbfbff291faac5bce524eca675d6caf
URL: https://github.com/llvm/llvm-project/commit/398af9b43bbfbff291faac5bce524eca675d6caf
DIFF: https://github.com/llvm/llvm-project/commit/398af9b43bbfbff291faac5bce524eca675d6caf.diff
LOG: [llvm] Use *{Map,Set}::contains (NFC)
Added:
Modified:
llvm/include/llvm/Analysis/DependenceGraphBuilder.h
llvm/include/llvm/Analysis/LazyCallGraph.h
llvm/include/llvm/Analysis/TargetLibraryInfo.h
llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h
llvm/include/llvm/CodeGen/MachineRegisterInfo.h
llvm/include/llvm/CodeGen/SlotIndexes.h
llvm/lib/Analysis/DDG.cpp
llvm/lib/Analysis/InstructionPrecedenceTracking.cpp
llvm/lib/CodeGen/CodeGenPrepare.cpp
llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
llvm/lib/CodeGen/MachineFunction.cpp
llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp
llvm/lib/LTO/ThinLTOCodeGenerator.cpp
llvm/lib/MC/MCWin64EH.cpp
llvm/lib/MC/WinCOFFObjectWriter.cpp
llvm/lib/MC/XCOFFObjectWriter.cpp
llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp
llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp
llvm/lib/Target/X86/X86OptimizeLEAs.cpp
llvm/lib/Transforms/IPO/IROutliner.cpp
llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
llvm/lib/Transforms/Vectorize/VPlan.cpp
llvm/tools/llvm-mca/Views/BottleneckAnalysis.h
llvm/tools/llvm-mca/Views/ResourcePressureView.cpp
llvm/unittests/IR/ValueHandleTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Analysis/DependenceGraphBuilder.h b/llvm/include/llvm/Analysis/DependenceGraphBuilder.h
index e0dbdcdaa7496..f490f20e7c19a 100644
--- a/llvm/include/llvm/Analysis/DependenceGraphBuilder.h
+++ b/llvm/include/llvm/Analysis/DependenceGraphBuilder.h
@@ -156,7 +156,7 @@ template <class GraphType> class AbstractDependenceGraphBuilder {
/// Given an instruction \p I return its associated ordinal number.
size_t getOrdinal(Instruction &I) {
- assert(InstOrdinalMap.find(&I) != InstOrdinalMap.end() &&
+ assert(InstOrdinalMap.contains(&I) &&
"No ordinal computed for this instruction.");
return InstOrdinalMap[&I];
}
diff --git a/llvm/include/llvm/Analysis/LazyCallGraph.h b/llvm/include/llvm/Analysis/LazyCallGraph.h
index d438cea9bf851..211a058aa0173 100644
--- a/llvm/include/llvm/Analysis/LazyCallGraph.h
+++ b/llvm/include/llvm/Analysis/LazyCallGraph.h
@@ -255,7 +255,7 @@ class LazyCallGraph {
iterator end() { return iterator(Edges.end(), Edges.end()); }
Edge &operator[](Node &N) {
- assert(EdgeIndexMap.find(&N) != EdgeIndexMap.end() && "No such edge!");
+ assert(EdgeIndexMap.contains(&N) && "No such edge!");
auto &E = Edges[EdgeIndexMap.find(&N)->second];
assert(E && "Dead or null edge!");
return E;
diff --git a/llvm/include/llvm/Analysis/TargetLibraryInfo.h b/llvm/include/llvm/Analysis/TargetLibraryInfo.h
index 42eb11fc34e92..1626798ba1c21 100644
--- a/llvm/include/llvm/Analysis/TargetLibraryInfo.h
+++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.h
@@ -138,7 +138,7 @@ class TargetLibraryInfoImpl {
if (StandardNames[F] != Name) {
setState(F, CustomName);
CustomNames[F] = std::string(Name);
- assert(CustomNames.find(F) != CustomNames.end());
+ assert(CustomNames.contains(F));
} else {
setState(F, StandardName);
}
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h b/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h
index d9af80b7eab24..48c49c22f81d0 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h
@@ -115,7 +115,7 @@ class IRTranslator : public MachineFunctionPass {
private:
VRegListT *insertVRegs(const Value &V) {
- assert(ValToVRegs.find(&V) == ValToVRegs.end() && "Value already exists");
+ assert(!ValToVRegs.contains(&V) && "Value already exists");
// We placement new using our fast allocator since we never try to free
// the vectors until translation is finished.
@@ -125,8 +125,7 @@ class IRTranslator : public MachineFunctionPass {
}
OffsetListT *insertOffsets(const Value &V) {
- assert(TypeToOffsets.find(V.getType()) == TypeToOffsets.end() &&
- "Type already exists");
+ assert(!TypeToOffsets.contains(V.getType()) && "Type already exists");
auto *OffsetList = new (OffsetAlloc.Allocate()) OffsetListT();
TypeToOffsets[V.getType()] = OffsetList;
diff --git a/llvm/include/llvm/CodeGen/MachineRegisterInfo.h b/llvm/include/llvm/CodeGen/MachineRegisterInfo.h
index 7f0c24e4e1154..ce447be3af41f 100644
--- a/llvm/include/llvm/CodeGen/MachineRegisterInfo.h
+++ b/llvm/include/llvm/CodeGen/MachineRegisterInfo.h
@@ -452,7 +452,7 @@ class MachineRegisterInfo {
}
void insertVRegByName(StringRef Name, Register Reg) {
- assert((Name.empty() || VRegNames.find(Name) == VRegNames.end()) &&
+ assert((Name.empty() || !VRegNames.contains(Name)) &&
"Named VRegs Must be Unique.");
if (!Name.empty()) {
VRegNames.insert(Name);
diff --git a/llvm/include/llvm/CodeGen/SlotIndexes.h b/llvm/include/llvm/CodeGen/SlotIndexes.h
index 403a94c53dc43..7e013dbf2ab38 100644
--- a/llvm/include/llvm/CodeGen/SlotIndexes.h
+++ b/llvm/include/llvm/CodeGen/SlotIndexes.h
@@ -540,7 +540,7 @@ class raw_ostream;
SlotIndex insertMachineInstrInMaps(MachineInstr &MI, bool Late = false) {
assert(!MI.isInsideBundle() &&
"Instructions inside bundles should use bundle start's slot.");
- assert(mi2iMap.find(&MI) == mi2iMap.end() && "Instr already indexed.");
+ assert(!mi2iMap.contains(&MI) && "Instr already indexed.");
// Numbering debug instructions could cause code generation to be
// affected by debug information.
assert(!MI.isDebugInstr() && "Cannot number debug instructions.");
diff --git a/llvm/lib/Analysis/DDG.cpp b/llvm/lib/Analysis/DDG.cpp
index 30f8d317dcd00..a0774096c5129 100644
--- a/llvm/lib/Analysis/DDG.cpp
+++ b/llvm/lib/Analysis/DDG.cpp
@@ -244,8 +244,7 @@ const PiBlockDDGNode *DataDependenceGraph::getPiBlock(const NodeType &N) const {
if (!PiBlockMap.contains(&N))
return nullptr;
auto *Pi = PiBlockMap.find(&N)->second;
- assert(PiBlockMap.find(Pi) == PiBlockMap.end() &&
- "Nested pi-blocks detected.");
+ assert(!PiBlockMap.contains(Pi) && "Nested pi-blocks detected.");
return Pi;
}
diff --git a/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp b/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp
index 0ce72dae0c4b4..fba5859b74cef 100644
--- a/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp
+++ b/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp
@@ -49,7 +49,7 @@ const Instruction *InstructionPrecedenceTracking::getFirstSpecialInstruction(
if (!FirstSpecialInsts.contains(BB)) {
fill(BB);
- assert(FirstSpecialInsts.find(BB) != FirstSpecialInsts.end() && "Must be!");
+ assert(FirstSpecialInsts.contains(BB) && "Must be!");
}
return FirstSpecialInsts[BB];
}
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index 2c83d706306fc..8d11f282516c8 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -3848,17 +3848,17 @@ class AddressingModeCombiner {
SimplificationTracker &ST) {
while (!TraverseOrder.empty()) {
Value *Current = TraverseOrder.pop_back_val();
- assert(Map.find(Current) != Map.end() && "No node to fill!!!");
+ assert(Map.contains(Current) && "No node to fill!!!");
Value *V = Map[Current];
if (SelectInst *Select = dyn_cast<SelectInst>(V)) {
// CurrentValue also must be Select.
auto *CurrentSelect = cast<SelectInst>(Current);
auto *TrueValue = CurrentSelect->getTrueValue();
- assert(Map.find(TrueValue) != Map.end() && "No True Value!");
+ assert(Map.contains(TrueValue) && "No True Value!");
Select->setTrueValue(ST.Get(Map[TrueValue]));
auto *FalseValue = CurrentSelect->getFalseValue();
- assert(Map.find(FalseValue) != Map.end() && "No False Value!");
+ assert(Map.contains(FalseValue) && "No False Value!");
Select->setFalseValue(ST.Get(Map[FalseValue]));
} else {
// Must be a Phi node then.
@@ -3866,7 +3866,7 @@ class AddressingModeCombiner {
// Fill the Phi node with values from predecessors.
for (auto *B : predecessors(PHI->getParent())) {
Value *PV = cast<PHINode>(Current)->getIncomingValueForBlock(B);
- assert(Map.find(PV) != Map.end() && "No predecessor Value!");
+ assert(Map.contains(PV) && "No predecessor Value!");
PHI->addIncoming(ST.Get(Map[PV]), B);
}
}
diff --git a/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h b/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
index 2fdc37c6dda26..cb0008a5ce6ed 100644
--- a/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
+++ b/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
@@ -740,7 +740,7 @@ class MLocTracker {
unsigned getLocID(SpillLocationNo Spill, StackSlotPos Idx) {
unsigned SlotNo = Spill.id() - 1;
SlotNo *= NumSlotIdxes;
- assert(StackSlotIdxes.find(Idx) != StackSlotIdxes.end());
+ assert(StackSlotIdxes.contains(Idx));
SlotNo += StackSlotIdxes[Idx];
SlotNo += NumRegs;
return SlotNo;
diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp
index a0e20437fbf37..4a908493e58ae 100644
--- a/llvm/lib/CodeGen/MachineFunction.cpp
+++ b/llvm/lib/CodeGen/MachineFunction.cpp
@@ -427,8 +427,7 @@ void MachineFunction::deleteMachineInstr(MachineInstr *MI) {
// be triggered during the implementation of support for the
// call site info of a new architecture. If the assertion is triggered,
// back trace will tell where to insert a call to updateCallSiteInfo().
- assert((!MI->isCandidateForCallSiteEntry() ||
- CallSitesInfo.find(MI) == CallSitesInfo.end()) &&
+ assert((!MI->isCandidateForCallSiteEntry() || !CallSitesInfo.contains(MI)) &&
"Call site info was not updated!");
// Strip it for parts. The operand array and the MI object itself are
// independently recyclable.
diff --git a/llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp b/llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp
index f1eeee3b3599d..b5b76130c55eb 100644
--- a/llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp
+++ b/llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp
@@ -176,7 +176,7 @@ void GDBJITRegistrationListener::notifyObjectLoaded(
size_t Size = DebugObj.getBinary()->getMemoryBufferRef().getBufferSize();
std::lock_guard<llvm::sys::Mutex> locked(JITDebugLock);
- assert(ObjectBufferMap.find(K) == ObjectBufferMap.end() &&
+ assert(!ObjectBufferMap.contains(K) &&
"Second attempt to perform debug registration.");
jit_code_entry* JITCodeEntry = new jit_code_entry();
diff --git a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
index 595906a44bb44..144cc5a1e8971 100644
--- a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
+++ b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
@@ -150,7 +150,7 @@ static StringMap<lto::InputFile *>
generateModuleMap(std::vector<std::unique_ptr<lto::InputFile>> &Modules) {
StringMap<lto::InputFile *> ModuleMap;
for (auto &M : Modules) {
- assert(ModuleMap.find(M->getName()) == ModuleMap.end() &&
+ assert(!ModuleMap.contains(M->getName()) &&
"Expect unique Buffer Identifier");
ModuleMap[M->getName()] = M.get();
}
diff --git a/llvm/lib/MC/MCWin64EH.cpp b/llvm/lib/MC/MCWin64EH.cpp
index 1a55722133ccd..a2d61da722af8 100644
--- a/llvm/lib/MC/MCWin64EH.cpp
+++ b/llvm/lib/MC/MCWin64EH.cpp
@@ -1089,7 +1089,7 @@ static void ARM64ProcessEpilogs(WinEH::FrameInfo *info,
FindMatchingEpilog(EpilogInstrs, AddedEpilogs, info);
int PrologOffset;
if (MatchingEpilog) {
- assert(EpilogInfo.find(MatchingEpilog) != EpilogInfo.end() &&
+ assert(EpilogInfo.contains(MatchingEpilog) &&
"Duplicate epilog not found");
EpilogInfo[EpilogStart] = EpilogInfo.lookup(MatchingEpilog);
// Clear the unwind codes in the EpilogMap, so that they don't get output
@@ -2369,7 +2369,7 @@ static void ARMEmitUnwindInfo(MCStreamer &streamer, WinEH::FrameInfo *info,
FindMatchingEpilog(EpilogInstrs, AddedEpilogs, info);
int PrologOffset;
if (MatchingEpilog) {
- assert(EpilogInfo.find(MatchingEpilog) != EpilogInfo.end() &&
+ assert(EpilogInfo.contains(MatchingEpilog) &&
"Duplicate epilog not found");
EpilogInfo[EpilogStart] = EpilogInfo.lookup(MatchingEpilog);
// Clear the unwind codes in the EpilogMap, so that they don't get output
@@ -2449,7 +2449,7 @@ static void ARMEmitUnwindInfo(MCStreamer &streamer, WinEH::FrameInfo *info,
else
OffsetExpr = GetSubDivExpr(streamer, EpilogStart, info->Begin, 2);
- assert(info->EpilogMap.find(EpilogStart) != info->EpilogMap.end());
+ assert(info->EpilogMap.contains(EpilogStart));
unsigned Condition = info->EpilogMap[EpilogStart].Condition;
assert(Condition <= 0xf);
diff --git a/llvm/lib/MC/WinCOFFObjectWriter.cpp b/llvm/lib/MC/WinCOFFObjectWriter.cpp
index c0b5e8bdc5039..4927ea6177fdb 100644
--- a/llvm/lib/MC/WinCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/WinCOFFObjectWriter.cpp
@@ -716,7 +716,7 @@ void WinCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
MCSection *MCSec = Fragment->getParent();
// Mark this symbol as requiring an entry in the symbol table.
- assert(SectionMap.find(MCSec) != SectionMap.end() &&
+ assert(SectionMap.contains(MCSec) &&
"Section must already have been defined in executePostLayoutBinding!");
COFFSection *Sec = SectionMap[MCSec];
@@ -753,7 +753,7 @@ void WinCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
if (A.isTemporary()) {
MCSection *TargetSection = &A.getSection();
assert(
- SectionMap.find(TargetSection) != SectionMap.end() &&
+ SectionMap.contains(TargetSection) &&
"Section must already have been defined in executePostLayoutBinding!");
COFFSection *Section = SectionMap[TargetSection];
Reloc.Symb = Section->Symbol;
@@ -774,7 +774,7 @@ void WinCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
}
} else {
assert(
- SymbolMap.find(&A) != SymbolMap.end() &&
+ SymbolMap.contains(&A) &&
"Symbol must already have been defined in executePostLayoutBinding!");
Reloc.Symb = SymbolMap[&A];
}
@@ -1106,7 +1106,7 @@ uint64_t WinCOFFObjectWriter::writeObject(MCAssembler &Asm,
}
MCSection *TargetSection = &S->getSection();
- assert(SectionMap.find(TargetSection) != SectionMap.end() &&
+ assert(SectionMap.contains(TargetSection) &&
"Section must already have been defined in "
"executePostLayoutBinding!");
encodeULEB128(SectionMap[TargetSection]->Symbol->getIndex(), OS);
diff --git a/llvm/lib/MC/XCOFFObjectWriter.cpp b/llvm/lib/MC/XCOFFObjectWriter.cpp
index f5d26d163efb2..c79bdeb2cac4c 100644
--- a/llvm/lib/MC/XCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/XCOFFObjectWriter.cpp
@@ -488,8 +488,7 @@ void XCOFFObjectWriter::executePostLayoutBinding(MCAssembler &Asm,
const MCAsmLayout &Layout) {
for (const auto &S : Asm) {
const auto *MCSec = cast<const MCSectionXCOFF>(&S);
- assert(SectionMap.find(MCSec) == SectionMap.end() &&
- "Cannot add a section twice.");
+ assert(!SectionMap.contains(MCSec) && "Cannot add a section twice.");
// If the name does not fit in the storage provided in the symbol table
// entry, add it to the string table.
@@ -547,7 +546,7 @@ void XCOFFObjectWriter::executePostLayoutBinding(MCAssembler &Asm,
if (!XSym->isExternal())
continue;
- assert(SectionMap.find(ContainingCsect) != SectionMap.end() &&
+ assert(SectionMap.contains(ContainingCsect) &&
"Expected containing csect to exist in map");
XCOFFSection *Csect = SectionMap[ContainingCsect];
// Lookup the containing csect and add the symbol to it.
@@ -616,7 +615,7 @@ void XCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
TargetObjectWriter->getRelocTypeAndSignSize(Target, Fixup, IsPCRel);
const MCSectionXCOFF *SymASec = getContainingCsect(cast<MCSymbolXCOFF>(SymA));
- assert(SectionMap.find(SymASec) != SectionMap.end() &&
+ assert(SectionMap.contains(SymASec) &&
"Expected containing csect to exist in map.");
const uint32_t Index = getIndex(SymA, SymASec);
@@ -674,7 +673,7 @@ void XCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
XCOFFRelocation Reloc = {Index, FixupOffsetInCsect, SignAndSize, Type};
MCSectionXCOFF *RelocationSec = cast<MCSectionXCOFF>(Fragment->getParent());
- assert(SectionMap.find(RelocationSec) != SectionMap.end() &&
+ assert(SectionMap.contains(RelocationSec) &&
"Expected containing csect to exist in map.");
SectionMap[RelocationSec]->Relocations.push_back(Reloc);
@@ -686,7 +685,7 @@ void XCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
report_fatal_error("relocation for opposite term is not yet supported");
const MCSectionXCOFF *SymBSec = getContainingCsect(cast<MCSymbolXCOFF>(SymB));
- assert(SectionMap.find(SymBSec) != SectionMap.end() &&
+ assert(SectionMap.contains(SymBSec) &&
"Expected containing csect to exist in map.");
if (SymASec == SymBSec)
report_fatal_error(
diff --git a/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp b/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp
index 365ba524a757e..ea88021eec3df 100644
--- a/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp
+++ b/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp
@@ -618,7 +618,7 @@ void PPCVSXSwapRemoval::formWebs() {
continue;
MachineInstr* DefMI = MRI->getVRegDef(Reg);
- assert(SwapMap.find(DefMI) != SwapMap.end() &&
+ assert(SwapMap.contains(DefMI) &&
"Inconsistency: def of vector reg not found in swap map!");
int DefIdx = SwapMap[DefMI];
(void)EC->unionSets(SwapVector[DefIdx].VSEId,
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp
index 4fe339ce52931..72a53b6c388ea 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp
@@ -501,7 +501,7 @@ struct StaticLibcallNameMap {
if (NameLibcall.first != nullptr &&
getRuntimeLibcallSignatures().Table[NameLibcall.second] !=
unsupported) {
- assert(Map.find(NameLibcall.first) == Map.end() &&
+ assert(!Map.contains(NameLibcall.first) &&
"duplicate libcall names in name map");
Map[NameLibcall.first] = NameLibcall.second;
}
diff --git a/llvm/lib/Target/X86/X86OptimizeLEAs.cpp b/llvm/lib/Target/X86/X86OptimizeLEAs.cpp
index e0018a0ea58ba..3172896a8f609 100644
--- a/llvm/lib/Target/X86/X86OptimizeLEAs.cpp
+++ b/llvm/lib/Target/X86/X86OptimizeLEAs.cpp
@@ -321,8 +321,7 @@ int X86OptimizeLEAPass::calcInstrDist(const MachineInstr &First,
// presented in InstrPos.
assert(Last.getParent() == First.getParent() &&
"Instructions are in
diff erent basic blocks");
- assert(InstrPos.find(&First) != InstrPos.end() &&
- InstrPos.find(&Last) != InstrPos.end() &&
+ assert(InstrPos.contains(&First) && InstrPos.contains(&Last) &&
"Instructions' positions are undefined");
return InstrPos[&Last] - InstrPos[&First];
diff --git a/llvm/lib/Transforms/IPO/IROutliner.cpp b/llvm/lib/Transforms/IPO/IROutliner.cpp
index b55aae1761406..788dc9b2ba9f6 100644
--- a/llvm/lib/Transforms/IPO/IROutliner.cpp
+++ b/llvm/lib/Transforms/IPO/IROutliner.cpp
@@ -1815,8 +1815,7 @@ replaceArgumentUses(OutlinableRegion &Region,
for (unsigned ArgIdx = 0; ArgIdx < Region.ExtractedFunction->arg_size();
ArgIdx++) {
- assert(Region.ExtractedArgToAgg.find(ArgIdx) !=
- Region.ExtractedArgToAgg.end() &&
+ assert(Region.ExtractedArgToAgg.contains(ArgIdx) &&
"No mapping from extracted to outlined?");
unsigned AggArgIdx = Region.ExtractedArgToAgg.find(ArgIdx)->second;
Argument *AggArg = Group.OutlinedFunction->getArg(AggArgIdx);
diff --git a/llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp b/llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
index 327b500cb7df5..c5f0d2d207684 100644
--- a/llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
@@ -1888,8 +1888,7 @@ void CHR::fixupBranch(Region *R, CHRScope *Scope,
assert((IsTrueBiased || Scope->FalseBiasedRegions.count(R)) &&
"Must be truthy or falsy");
auto *BI = cast<BranchInst>(R->getEntry()->getTerminator());
- assert(BranchBiasMap.find(R) != BranchBiasMap.end() &&
- "Must be in the bias map");
+ assert(BranchBiasMap.contains(R) && "Must be in the bias map");
BranchProbability Bias = BranchBiasMap[R];
assert(Bias >= getCHRBiasThreshold() && "Must be highly biased");
// Take the min.
@@ -1931,8 +1930,7 @@ void CHR::fixupSelect(SelectInst *SI, CHRScope *Scope,
bool IsTrueBiased = Scope->TrueBiasedSelects.count(SI);
assert((IsTrueBiased ||
Scope->FalseBiasedSelects.count(SI)) && "Must be biased");
- assert(SelectBiasMap.find(SI) != SelectBiasMap.end() &&
- "Must be in the bias map");
+ assert(SelectBiasMap.contains(SI) && "Must be in the bias map");
BranchProbability Bias = SelectBiasMap[SI];
assert(Bias >= getCHRBiasThreshold() && "Must be highly biased");
// Take the min.
diff --git a/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp b/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
index 37c32e12635ae..cdb5639ef04e7 100644
--- a/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
+++ b/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
@@ -703,7 +703,7 @@ static Value *findBaseDefiningValueCached(Value *I, DefiningValueMapTy &Cache,
<< KnownBases[I] << "\n");
}
assert(Cache[I] != nullptr);
- assert(KnownBases.find(Cache[I]) != KnownBases.end() &&
+ assert(KnownBases.contains(Cache[I]) &&
"Cached value must be present in known bases map");
return Cache[I];
}
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index 05922d3fa2146..86a190fd2bf53 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -1407,7 +1407,7 @@ class LoopVectorizationCostModel {
InstructionCost getWideningCost(Instruction *I, ElementCount VF) {
assert(VF.isVector() && "Expected VF >=2");
std::pair<Instruction *, ElementCount> InstOnVF = std::make_pair(I, VF);
- assert(WideningDecisions.find(InstOnVF) != WideningDecisions.end() &&
+ assert(WideningDecisions.contains(InstOnVF) &&
"The cost is not calculated");
return WideningDecisions[InstOnVF].second;
}
@@ -4232,7 +4232,7 @@ void LoopVectorizationCostModel::collectLoopScalars(ElementCount VF) {
// We should not collect Scalars more than once per VF. Right now, this
// function is called from collectUniformsAndScalars(), which already does
// this check. Collecting Scalars for VF=1 does not make any sense.
- assert(VF.isVector() && Scalars.find(VF) == Scalars.end() &&
+ assert(VF.isVector() && !Scalars.contains(VF) &&
"This function should not be visited twice for the same VF");
// This avoids any chances of creating a REPLICATE recipe during planning
@@ -4659,7 +4659,7 @@ void LoopVectorizationCostModel::collectLoopUniforms(ElementCount VF) {
// already does this check. Collecting Uniforms for VF=1 does not make any
// sense.
- assert(VF.isVector() && Uniforms.find(VF) == Uniforms.end() &&
+ assert(VF.isVector() && !Uniforms.contains(VF) &&
"This function should not be visited twice for the same VF");
// Visit the list of Uniforms. If we'll not find any uniform value, we'll
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.cpp b/llvm/lib/Transforms/Vectorize/VPlan.cpp
index 3c2646296945b..20484c31b7357 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlan.cpp
@@ -1102,7 +1102,7 @@ VPInterleavedAccessInfo::VPInterleavedAccessInfo(VPlan &Plan,
}
void VPSlotTracker::assignSlot(const VPValue *V) {
- assert(Slots.find(V) == Slots.end() && "VPValue already has a slot!");
+ assert(!Slots.contains(V) && "VPValue already has a slot!");
Slots[V] = NextSlot++;
}
diff --git a/llvm/tools/llvm-mca/Views/BottleneckAnalysis.h b/llvm/tools/llvm-mca/Views/BottleneckAnalysis.h
index cd5af0afcf5b6..e709b25c3f768 100644
--- a/llvm/tools/llvm-mca/Views/BottleneckAnalysis.h
+++ b/llvm/tools/llvm-mca/Views/BottleneckAnalysis.h
@@ -146,19 +146,19 @@ class PressureTracker {
SmallVectorImpl<User> &Users) const;
unsigned getRegisterPressureCycles(unsigned IID) const {
- assert(IPI.find(IID) != IPI.end() && "Instruction is not tracked!");
+ assert(IPI.contains(IID) && "Instruction is not tracked!");
const InstructionPressureInfo &Info = IPI.find(IID)->second;
return Info.RegisterPressureCycles;
}
unsigned getMemoryPressureCycles(unsigned IID) const {
- assert(IPI.find(IID) != IPI.end() && "Instruction is not tracked!");
+ assert(IPI.contains(IID) && "Instruction is not tracked!");
const InstructionPressureInfo &Info = IPI.find(IID)->second;
return Info.MemoryPressureCycles;
}
unsigned getResourcePressureCycles(unsigned IID) const {
- assert(IPI.find(IID) != IPI.end() && "Instruction is not tracked!");
+ assert(IPI.contains(IID) && "Instruction is not tracked!");
const InstructionPressureInfo &Info = IPI.find(IID)->second;
return Info.ResourcePressureCycles;
}
diff --git a/llvm/tools/llvm-mca/Views/ResourcePressureView.cpp b/llvm/tools/llvm-mca/Views/ResourcePressureView.cpp
index 1aa00775b5307..0f059bcc0a069 100644
--- a/llvm/tools/llvm-mca/Views/ResourcePressureView.cpp
+++ b/llvm/tools/llvm-mca/Views/ResourcePressureView.cpp
@@ -57,7 +57,7 @@ void ResourcePressureView::onEvent(const HWInstructionEvent &Event) {
for (const std::pair<ResourceRef, ResourceCycles> &Use :
IssueEvent.UsedResources) {
const ResourceRef &RR = Use.first;
- assert(Resource2VecIndex.find(RR.first) != Resource2VecIndex.end());
+ assert(Resource2VecIndex.contains(RR.first));
unsigned R2VIndex = Resource2VecIndex[RR.first];
R2VIndex += llvm::countr_zero(RR.second);
ResourceUsage[R2VIndex + NumResourceUnits * SourceIdx] += Use.second;
diff --git a/llvm/unittests/IR/ValueHandleTest.cpp b/llvm/unittests/IR/ValueHandleTest.cpp
index 8eb6b5f89a409..e11c545520d5a 100644
--- a/llvm/unittests/IR/ValueHandleTest.cpp
+++ b/llvm/unittests/IR/ValueHandleTest.cpp
@@ -496,8 +496,8 @@ TEST_F(ValueHandle, AssertingVH_DenseMap) {
Map.insert({BitcastV.get(), 1});
Map.insert({ConstantV, 2});
// These will create a temporary AssertingVH during lookup.
- EXPECT_TRUE(Map.find(BitcastV.get()) != Map.end());
- EXPECT_TRUE(Map.find(ConstantV) != Map.end());
+ EXPECT_TRUE(Map.contains(BitcastV.get()));
+ EXPECT_TRUE(Map.contains(ConstantV));
// These will not create a temporary AssertingVH.
EXPECT_TRUE(Map.find_as(BitcastV.get()) != Map.end());
EXPECT_TRUE(Map.find_as(ConstantV) != Map.end());
@@ -508,8 +508,8 @@ TEST_F(ValueHandle, PoisoningVH_DenseMap) {
Map.insert({BitcastV.get(), 1});
Map.insert({ConstantV, 2});
// These will create a temporary PoisoningVH during lookup.
- EXPECT_TRUE(Map.find(BitcastV.get()) != Map.end());
- EXPECT_TRUE(Map.find(ConstantV) != Map.end());
+ EXPECT_TRUE(Map.contains(BitcastV.get()));
+ EXPECT_TRUE(Map.contains(ConstantV));
// These will not create a temporary PoisoningVH.
EXPECT_TRUE(Map.find_as(BitcastV.get()) != Map.end());
EXPECT_TRUE(Map.find_as(ConstantV) != Map.end());
More information about the llvm-commits
mailing list