[llvm] r339230 - [Wasm] Don't iterate over MachineBasicBlock::successors while erasing from it
Benjamin Kramer via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 8 03:13:19 PDT 2018
Author: d0k
Date: Wed Aug 8 03:13:19 2018
New Revision: 339230
URL: http://llvm.org/viewvc/llvm-project?rev=339230&view=rev
Log:
[Wasm] Don't iterate over MachineBasicBlock::successors while erasing from it
This will read out of bounds. Found by asan.
Modified:
llvm/trunk/lib/Target/WebAssembly/WebAssemblyLateEHPrepare.cpp
Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyLateEHPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyLateEHPrepare.cpp?rev=339230&r1=339229&r2=339230&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyLateEHPrepare.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyLateEHPrepare.cpp Wed Aug 8 03:13:19 2018
@@ -83,11 +83,12 @@ MachineBasicBlock *GetMatchingEHPad(Mach
return EHPad;
}
-// Erases the given BB and all its children from the function. If other BBs have
-// this BB as a successor, the successor relationships will be deleted as well.
-static void EraseBBAndChildren(MachineBasicBlock *MBB) {
- SmallVector<MachineBasicBlock *, 8> WL;
- WL.push_back(MBB);
+// Erases the given BBs and all their children from the function. If other BBs
+// have the BB as a successor, the successor relationships will be deleted as
+// well.
+template <typename Container>
+static void EraseBBsAndChildren(const Container &MBBs) {
+ SmallVector<MachineBasicBlock *, 8> WL(MBBs.begin(), MBBs.end());
while (!WL.empty()) {
MachineBasicBlock *MBB = WL.pop_back_val();
for (auto *Pred : MBB->predecessors())
@@ -243,9 +244,11 @@ bool WebAssemblyLateEHPrepare::addRethro
// eventually lead to an unreachable. Delete it because rethrow itself is
// a terminator, and also delete non-EH pad successors if any.
MBB.erase(std::next(MachineBasicBlock::iterator(Rethrow)), MBB.end());
+ SmallVector<MachineBasicBlock *, 8> NonPadSuccessors;
for (auto *Succ : MBB.successors())
if (!Succ->isEHPad())
- EraseBBAndChildren(Succ);
+ NonPadSuccessors.push_back(Succ);
+ EraseBBsAndChildren(NonPadSuccessors);
}
return Changed;
}
@@ -302,8 +305,7 @@ bool WebAssemblyLateEHPrepare::ensureSin
BuildMI(*EHPad, InsertPos, Call->getDebugLoc(),
TII.get(WebAssembly::UNREACHABLE));
EHPad->erase(InsertPos, EHPad->end());
- for (auto *Succ : EHPad->successors())
- EraseBBAndChildren(Succ);
+ EraseBBsAndChildren(EHPad->successors());
}
return Changed;
}
More information about the llvm-commits
mailing list