6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-02 07:11:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix misue of iterator pointing to erased object. Uncovered by

Browse Source 
_GLIBCXX_DEBUG.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37793 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Greene 2007-06-29 02:45:24 +00:00
parent 6c631988c7
commit 8a46d342d8
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/CodeGen/MachineBasicBlock.h
View File

@ -211,9 +211,9 @@ public:
/// removeSuccessor - Remove specified successor from the successors list of
/// this MachineBasicBlock. The Predecessors list of succ is automatically
/// updated.
/// updated. Return the iterator to the element after the one removed.
///
void removeSuccessor(succ_iterator I);
succ_iterator removeSuccessor(succ_iterator I);
/// isSuccessor - Return true if the specified MBB is a successor of this
/// block.

9
lib/CodeGen/BranchFolding.cpp
View File

@ -978,17 +978,18 @@ void BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
}
// Iterate through all the predecessors, revectoring each in-turn.
MachineBasicBlock::pred_iterator PI = MBB->pred_begin();
size_t PI = 0;
bool DidChange = false;
bool HasBranchToSelf = false;
while (PI != MBB->pred_end()) {
if (*PI == MBB) {
while(PI != MBB->pred_size()) {
MachineBasicBlock *PMBB = *(MBB->pred_begin() + PI);
if (PMBB == MBB) {
// If this block has an uncond branch to itself, leave it.
++PI;
HasBranchToSelf = true;
} else {
DidChange = true;
(*PI)->ReplaceUsesOfBlockWith(MBB, CurTBB);
PMBB->ReplaceUsesOfBlockWith(MBB, CurTBB);
}
}

6
lib/CodeGen/MachineBasicBlock.cpp
View File

@ -176,10 +176,10 @@ void MachineBasicBlock::removeSuccessor(MachineBasicBlock *succ) {
Successors.erase(I);
}
void MachineBasicBlock::removeSuccessor(succ_iterator I) {
MachineBasicBlock::succ_iterator MachineBasicBlock::removeSuccessor(succ_iterator I) {
assert(I != Successors.end() && "Not a current successor!");
(*I)->removePredecessor(this);
Successors.erase(I);
return(Successors.erase(I));
}
void MachineBasicBlock::addPredecessor(MachineBasicBlock *pred) {
@ -273,7 +273,7 @@ bool MachineBasicBlock::CorrectExtraCFGEdges(MachineBasicBlock *DestA,
++SI;
} else {
// Otherwise, this is a superfluous edge, remove it.
removeSuccessor(SI);
SI = removeSuccessor(SI);
MadeChange = true;
}
}