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

Iterators folloring a SmallVector erased element are invalidated so

Browse Source 
don't access cached iterators from after the erased element.

Re-apply 49056 with SmallVector support.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49106 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Greene 2008-04-02 18:24:46 +00:00
parent ea1d9cdc4e
commit a022e3fc2f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/ADT/SmallVector.h
View File

@ -208,19 +208,23 @@ public:
construct_range(Begin, End, Elt); construct_range(Begin, End, Elt);
} }
void erase(iterator I) { iterator erase(iterator I) {
iterator N = I;
// Shift all elts down one. // Shift all elts down one.
std::copy(I+1, End, I); std::copy(I+1, End, I);
// Drop the last elt. // Drop the last elt.
pop_back(); pop_back();
return(N);
} }
void erase(iterator S, iterator E) { iterator erase(iterator S, iterator E) {
iterator N = S;
// Shift all elts down. // Shift all elts down.
iterator I = std::copy(E, End, S); iterator I = std::copy(E, End, S);
// Drop the last elts. // Drop the last elts.
destroy_range(I, End); destroy_range(I, End);
End = I; End = I;
return(N);
} }
iterator insert(iterator I, const T &Elt) { iterator insert(iterator I, const T &Elt) {

10
lib/Transforms/Scalar/LoopIndexSplit.cpp
View File

@ -232,8 +232,8 @@ bool LoopIndexSplit::runOnLoop(Loop *IncomingLoop, LPPassManager &LPM_Ref) {
return false; return false;
// First see if it is possible to eliminate loop itself or not. // First see if it is possible to eliminate loop itself or not.
for (SmallVector<SplitInfo, 4>::iterator SI = SplitData.begin(), for (SmallVector<SplitInfo, 4>::iterator SI = SplitData.begin();
E = SplitData.end(); SI != E;) { SI != SplitData.end();) {
SplitInfo &SD = *SI; SplitInfo &SD = *SI;
ICmpInst *CI = dyn_cast<ICmpInst>(SD.SplitCondition); ICmpInst *CI = dyn_cast<ICmpInst>(SD.SplitCondition);
if (SD.SplitCondition->getOpcode() == Instruction::And) { if (SD.SplitCondition->getOpcode() == Instruction::And) {
@ -244,8 +244,7 @@ bool LoopIndexSplit::runOnLoop(Loop *IncomingLoop, LPPassManager &LPM_Ref) {
return Changed; return Changed;
} else { } else {
SmallVector<SplitInfo, 4>::iterator Delete_SI = SI; SmallVector<SplitInfo, 4>::iterator Delete_SI = SI;
++SI; SI = SplitData.erase(Delete_SI);
SplitData.erase(Delete_SI);
} }
} }
else if (CI && CI->getPredicate() == ICmpInst::ICMP_EQ) { else if (CI && CI->getPredicate() == ICmpInst::ICMP_EQ) {
@ -256,8 +255,7 @@ bool LoopIndexSplit::runOnLoop(Loop *IncomingLoop, LPPassManager &LPM_Ref) {
return Changed; return Changed;
} else { } else {
SmallVector<SplitInfo, 4>::iterator Delete_SI = SI; SmallVector<SplitInfo, 4>::iterator Delete_SI = SI;
++SI; SI = SplitData.erase(Delete_SI);
SplitData.erase(Delete_SI);
} }
} else } else
++SI; ++SI;