From a838043f387139cd470a3d2aa450ae6e04abd3c7 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 11 Jun 2022 11:46:16 -0700 Subject: [PATCH] [llvm] Use contains (NFC) --- llvm/lib/Target/Hexagon/HexagonHazardRecognizer.cpp | 2 +- llvm/lib/Transforms/IPO/IROutliner.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Target/Hexagon/HexagonHazardRecognizer.cpp b/llvm/lib/Target/Hexagon/HexagonHazardRecognizer.cpp index e2215c9..577eccd 100644 --- a/llvm/lib/Target/Hexagon/HexagonHazardRecognizer.cpp +++ b/llvm/lib/Target/Hexagon/HexagonHazardRecognizer.cpp @@ -106,7 +106,7 @@ bool HexagonHazardRecognizer::isNewStore(MachineInstr &MI) { if (!TII->mayBeNewStore(MI)) return false; MachineOperand &MO = MI.getOperand(MI.getNumOperands() - 1); - return (MO.isReg() && RegDefs.count(MO.getReg()) != 0); + return MO.isReg() && RegDefs.contains(MO.getReg()); } void HexagonHazardRecognizer::EmitInstruction(SUnit *SU) { diff --git a/llvm/lib/Transforms/IPO/IROutliner.cpp b/llvm/lib/Transforms/IPO/IROutliner.cpp index 2979b9d..2ecfd52 100644 --- a/llvm/lib/Transforms/IPO/IROutliner.cpp +++ b/llvm/lib/Transforms/IPO/IROutliner.cpp @@ -1183,14 +1183,14 @@ static Optional getGVNForPHINode(OutlinableRegion &Region, // adding an extra input. We ignore this case for now, and so ignore the // region. Optional OGVN = Cand.getGVN(Incoming); - if (!OGVN.hasValue() && (Blocks.find(IncomingBlock) != Blocks.end())) { + if (!OGVN.hasValue() && Blocks.contains(IncomingBlock)) { Region.IgnoreRegion = true; return None; } // If the incoming block isn't in the region, we don't have to worry about // this incoming value. - if (Blocks.find(IncomingBlock) == Blocks.end()) + if (!Blocks.contains(IncomingBlock)) continue; // Collect the canonical numbers of the values in the PHINode. @@ -1701,7 +1701,7 @@ findOrCreatePHIInBlock(PHINode &PN, OutlinableRegion &Region, for (PHINode &CurrPN : OverallPhiBlock->phis()) { // If this PHINode has already been matched to another PHINode to be merged, // we skip it. - if (UsedPHIs.find(&CurrPN) != UsedPHIs.end()) + if (UsedPHIs.contains(&CurrPN)) continue; CurrentCanonNums.clear(); -- 2.7.4