Skip to content

Commit e555cca

Browse files
[llvm] Call *Map::erase directly (NFC) (#135545)
1 parent d893d12 commit e555cca

File tree

4 files changed

+8
-19
lines changed

4 files changed

+8
-19
lines changed

llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,7 @@ class LVDWARFReader final : public LVBinaryReader {
102102
}
103103

104104
// Remove offset from global map.
105-
void removeGlobalOffset(LVOffset Offset) {
106-
LVOffsetElementMap::iterator Iter = GlobalOffsets.find(Offset);
107-
if (Iter != GlobalOffsets.end())
108-
GlobalOffsets.erase(Iter);
109-
}
105+
void removeGlobalOffset(LVOffset Offset) { GlobalOffsets.erase(Offset); }
110106

111107
// Get the location information for DW_AT_data_member_location.
112108
void processLocationMember(dwarf::Attribute Attr,

llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp

+4-6
Original file line numberDiff line numberDiff line change
@@ -2849,12 +2849,10 @@ ARMPreAllocLoadStoreOpt::RescheduleLoadStoreInstrs(MachineBasicBlock *MBB) {
28492849
// Erase the entry into the DbgValueSinkCandidates for the DBG_VALUE
28502850
// that was moved.
28512851
auto DbgVar = createDebugVariableFromMachineInstr(DbgInstr);
2852-
auto DbgIt = DbgValueSinkCandidates.find(DbgVar);
2853-
// If the instruction is a DBG_VALUE_LIST, it may have already been
2854-
// erased from the DbgValueSinkCandidates. Only erase if it exists in
2855-
// the DbgValueSinkCandidates.
2856-
if (DbgIt != DbgValueSinkCandidates.end())
2857-
DbgValueSinkCandidates.erase(DbgIt);
2852+
// Erase DbgVar from DbgValueSinkCandidates if still present. If the
2853+
// instruction is a DBG_VALUE_LIST, it may have already been erased from
2854+
// DbgValueSinkCandidates.
2855+
DbgValueSinkCandidates.erase(DbgVar);
28582856
// Zero out original dbg instr
28592857
forEachDbgRegOperand(DbgInstr,
28602858
[&](MachineOperand &Op) { Op.setReg(0); });

llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,8 @@ bool HexagonTfrCleanup::updateImmMap(MachineInstr *MI, ImmediateMap &IMap) {
160160
if (!Mo->isReg() || !Mo->isDef())
161161
continue;
162162
unsigned R = Mo->getReg();
163-
for (MCRegAliasIterator AR(R, TRI, true); AR.isValid(); ++AR) {
164-
ImmediateMap::iterator F = IMap.find(*AR);
165-
if (F != IMap.end())
166-
IMap.erase(F);
167-
}
163+
for (MCRegAliasIterator AR(R, TRI, true); AR.isValid(); ++AR)
164+
IMap.erase(*AR);
168165
}
169166
return true;
170167
}

llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -754,9 +754,7 @@ class LowerMatrixIntrinsics {
754754
/// Erase \p Inst from both ShapeMap (if an entry exists) and erase \p Inst
755755
/// itself.
756756
void eraseFromParentAndRemoveFromShapeMap(Instruction *Inst) {
757-
auto Iter = ShapeMap.find(Inst);
758-
if (Iter != ShapeMap.end())
759-
ShapeMap.erase(Iter);
757+
ShapeMap.erase(Inst);
760758
Inst->eraseFromParent();
761759
}
762760

0 commit comments

Comments
 (0)