maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix an iterator invalidation problem. operator[] on a DenseMap 

can insert a new element, invalidating iterators. Use find
instead, and handle the case where the key is not found explicitly.

llvm-svn: 151871
This commit is contained in:
Dan Gohman 2012-03-02 01:26:46 +00:00
parent 8dfdd89433
commit 362eb69f24
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
llvm/lib/Transforms/Scalar/ObjCARC.cpp
View File

@ -2421,12 +2421,22 @@ ObjCARCOpt::CheckForCFGHazards(const BasicBlock *BB,
--SE; --SE;
for (; SI != SE; ++SI) { for (; SI != SE; ++SI) {
PtrState &SuccS = BBStates[*SI].getPtrBottomUpState(Arg); Sequence SuccSSeq = S_None;
switch (SuccS.GetSeq()) { bool SuccSRRIKnownSafe = false;
// If VisitBottomUp has visited this successor, take what we know about it.
DenseMap<const BasicBlock *, BBState>::iterator BBI = BBStates.find(*SI);
if (BBI != BBStates.end()) {
const PtrState &SuccS = BBI->second.getPtrBottomUpState(Arg);
SuccSSeq = SuccS.GetSeq();
SuccSRRIKnownSafe = SuccS.RRI.KnownSafe;
}
switch (SuccSSeq) {
case S_None: case S_None:
case S_CanRelease: { case S_CanRelease: {
if (!S.RRI.KnownSafe && !SuccS.RRI.KnownSafe) if (!S.RRI.KnownSafe && !SuccSRRIKnownSafe) {
S.ClearSequenceProgress(); S.ClearSequenceProgress();
break;
}
continue; continue;
} }
case S_Use: case S_Use:
@ -2435,7 +2445,7 @@ ObjCARCOpt::CheckForCFGHazards(const BasicBlock *BB,
case S_Stop: case S_Stop:
case S_Release: case S_Release:
case S_MovableRelease: case S_MovableRelease:
if (!S.RRI.KnownSafe && !SuccS.RRI.KnownSafe) if (!S.RRI.KnownSafe && !SuccSRRIKnownSafe)
AllSuccsHaveSame = false; AllSuccsHaveSame = false;
break; break;
case S_Retain: case S_Retain:
@ -2464,11 +2474,21 @@ ObjCARCOpt::CheckForCFGHazards(const BasicBlock *BB,
--SE; --SE;
for (; SI != SE; ++SI) { for (; SI != SE; ++SI) {
PtrState &SuccS = BBStates[*SI].getPtrBottomUpState(Arg); Sequence SuccSSeq = S_None;
switch (SuccS.GetSeq()) { bool SuccSRRIKnownSafe = false;
// If VisitBottomUp has visited this successor, take what we know about it.
DenseMap<const BasicBlock *, BBState>::iterator BBI = BBStates.find(*SI);
if (BBI != BBStates.end()) {
const PtrState &SuccS = BBI->second.getPtrBottomUpState(Arg);
SuccSSeq = SuccS.GetSeq();
SuccSRRIKnownSafe = SuccS.RRI.KnownSafe;
}
switch (SuccSSeq) {
case S_None: { case S_None: {
if (!S.RRI.KnownSafe && !SuccS.RRI.KnownSafe) if (!S.RRI.KnownSafe && !SuccSRRIKnownSafe) {
S.ClearSequenceProgress(); S.ClearSequenceProgress();
break;
}
continue; continue;
} }
case S_CanRelease: case S_CanRelease:
@ -2478,7 +2498,7 @@ ObjCARCOpt::CheckForCFGHazards(const BasicBlock *BB,
case S_Release: case S_Release:
case S_MovableRelease: case S_MovableRelease:
case S_Use: case S_Use:
if (!S.RRI.KnownSafe && !SuccS.RRI.KnownSafe) if (!S.RRI.KnownSafe && !SuccSRRIKnownSafe)
AllSuccsHaveSame = false; AllSuccsHaveSame = false;
break; break;
case S_Retain: case S_Retain: