[llvm] Call *Map::erase directly (NFC) #135545
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-backend-hexagon @llvm/pr-subscribers-debuginfo Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/135545.diff 4 Files Affected:
diff --git a/llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h b/llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h
index fdc97249d8e5a..aa47bd9cd2cdd 100644
--- a/llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h
+++ b/llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h
@@ -102,11 +102,7 @@ class LVDWARFReader final : public LVBinaryReader {
}
// Remove offset from global map.
- void removeGlobalOffset(LVOffset Offset) {
- LVOffsetElementMap::iterator Iter = GlobalOffsets.find(Offset);
- if (Iter != GlobalOffsets.end())
- GlobalOffsets.erase(Iter);
- }
+ void removeGlobalOffset(LVOffset Offset) { GlobalOffsets.erase(Offset); }
// Get the location information for DW_AT_data_member_location.
void processLocationMember(dwarf::Attribute Attr,
diff --git a/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
index 2d45c42e724db..f8790dd063ae7 100644
--- a/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
+++ b/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
@@ -2849,12 +2849,10 @@ ARMPreAllocLoadStoreOpt::RescheduleLoadStoreInstrs(MachineBasicBlock *MBB) {
// Erase the entry into the DbgValueSinkCandidates for the DBG_VALUE
// that was moved.
auto DbgVar = createDebugVariableFromMachineInstr(DbgInstr);
- auto DbgIt = DbgValueSinkCandidates.find(DbgVar);
- // If the instruction is a DBG_VALUE_LIST, it may have already been
- // erased from the DbgValueSinkCandidates. Only erase if it exists in
- // the DbgValueSinkCandidates.
- if (DbgIt != DbgValueSinkCandidates.end())
- DbgValueSinkCandidates.erase(DbgIt);
+ // Erase DbgVar from DbgValueSinkCandidates if still present. If the
+ // instruction is a DBG_VALUE_LIST, it may have already been erased from
+ // DbgValueSinkCandidates.
+ DbgValueSinkCandidates.erase(DbgVar);
// Zero out original dbg instr
forEachDbgRegOperand(DbgInstr,
[&](MachineOperand &Op) { Op.setReg(0); });
diff --git a/llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp b/llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp
index 0c31e274a4eeb..71bdfc6657c57 100644
--- a/llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp
@@ -160,11 +160,8 @@ bool HexagonTfrCleanup::updateImmMap(MachineInstr *MI, ImmediateMap &IMap) {
if (!Mo->isReg() || !Mo->isDef())
continue;
unsigned R = Mo->getReg();
- for (MCRegAliasIterator AR(R, TRI, true); AR.isValid(); ++AR) {
- ImmediateMap::iterator F = IMap.find(*AR);
- if (F != IMap.end())
- IMap.erase(F);
- }
+ for (MCRegAliasIterator AR(R, TRI, true); AR.isValid(); ++AR)
+ IMap.erase(*AR);
}
return true;
}
diff --git a/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp b/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
index 60619dbe2f589..950344722b5cc 100644
--- a/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
@@ -754,9 +754,7 @@ class LowerMatrixIntrinsics {
/// Erase \p Inst from both ShapeMap (if an entry exists) and erase \p Inst
/// itself.
void eraseFromParentAndRemoveFromShapeMap(Instruction *Inst) {
- auto Iter = ShapeMap.find(Inst);
- if (Iter != ShapeMap.end())
- ShapeMap.erase(Iter);
+ ShapeMap.erase(Inst);
Inst->eraseFromParent();
}
|
|
@llvm/pr-subscribers-llvm-transforms Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/135545.diff 4 Files Affected:
diff --git a/llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h b/llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h
index fdc97249d8e5a..aa47bd9cd2cdd 100644
--- a/llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h
+++ b/llvm/include/llvm/DebugInfo/LogicalView/Readers/LVDWARFReader.h
@@ -102,11 +102,7 @@ class LVDWARFReader final : public LVBinaryReader {
}
// Remove offset from global map.
- void removeGlobalOffset(LVOffset Offset) {
- LVOffsetElementMap::iterator Iter = GlobalOffsets.find(Offset);
- if (Iter != GlobalOffsets.end())
- GlobalOffsets.erase(Iter);
- }
+ void removeGlobalOffset(LVOffset Offset) { GlobalOffsets.erase(Offset); }
// Get the location information for DW_AT_data_member_location.
void processLocationMember(dwarf::Attribute Attr,
diff --git a/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
index 2d45c42e724db..f8790dd063ae7 100644
--- a/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
+++ b/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
@@ -2849,12 +2849,10 @@ ARMPreAllocLoadStoreOpt::RescheduleLoadStoreInstrs(MachineBasicBlock *MBB) {
// Erase the entry into the DbgValueSinkCandidates for the DBG_VALUE
// that was moved.
auto DbgVar = createDebugVariableFromMachineInstr(DbgInstr);
- auto DbgIt = DbgValueSinkCandidates.find(DbgVar);
- // If the instruction is a DBG_VALUE_LIST, it may have already been
- // erased from the DbgValueSinkCandidates. Only erase if it exists in
- // the DbgValueSinkCandidates.
- if (DbgIt != DbgValueSinkCandidates.end())
- DbgValueSinkCandidates.erase(DbgIt);
+ // Erase DbgVar from DbgValueSinkCandidates if still present. If the
+ // instruction is a DBG_VALUE_LIST, it may have already been erased from
+ // DbgValueSinkCandidates.
+ DbgValueSinkCandidates.erase(DbgVar);
// Zero out original dbg instr
forEachDbgRegOperand(DbgInstr,
[&](MachineOperand &Op) { Op.setReg(0); });
diff --git a/llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp b/llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp
index 0c31e274a4eeb..71bdfc6657c57 100644
--- a/llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonTfrCleanup.cpp
@@ -160,11 +160,8 @@ bool HexagonTfrCleanup::updateImmMap(MachineInstr *MI, ImmediateMap &IMap) {
if (!Mo->isReg() || !Mo->isDef())
continue;
unsigned R = Mo->getReg();
- for (MCRegAliasIterator AR(R, TRI, true); AR.isValid(); ++AR) {
- ImmediateMap::iterator F = IMap.find(*AR);
- if (F != IMap.end())
- IMap.erase(F);
- }
+ for (MCRegAliasIterator AR(R, TRI, true); AR.isValid(); ++AR)
+ IMap.erase(*AR);
}
return true;
}
diff --git a/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp b/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
index 60619dbe2f589..950344722b5cc 100644
--- a/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
@@ -754,9 +754,7 @@ class LowerMatrixIntrinsics {
/// Erase \p Inst from both ShapeMap (if an entry exists) and erase \p Inst
/// itself.
void eraseFromParentAndRemoveFromShapeMap(Instruction *Inst) {
- auto Iter = ShapeMap.find(Inst);
- if (Iter != ShapeMap.end())
- ShapeMap.erase(Iter);
+ ShapeMap.erase(Inst);
Inst->eraseFromParent();
}
|
nikic
approved these changes
Apr 13, 2025
kuhar
approved these changes
Apr 13, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/169/builds/10432 Here is the relevant piece of the build log for the reference |
var-const
pushed a commit
to ldionne/llvm-project
that referenced
this pull request
Apr 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.