diff options
| author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2014-03-18 22:32:43 +0000 |
|---|---|---|
| committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2014-03-18 22:32:43 +0000 |
| commit | 9ea770ddbb8e883d8c446d19fc15efd7346b23e6 (patch) | |
| tree | 91ded3fac4b916d04e88e29c4653a102b1068d44 /lib/Transforms/ObjCARC | |
| parent | 6d1980d0ca715a2ec414c4e2eb31be509f5963ca (diff) | |
| download | llvm-9ea770ddbb8e883d8c446d19fc15efd7346b23e6.tar.gz llvm-9ea770ddbb8e883d8c446d19fc15efd7346b23e6.tar.bz2 llvm-9ea770ddbb8e883d8c446d19fc15efd7346b23e6.tar.xz | |
Fix use_iterator crash in ObjCArc from r203364
The use_iterator redesign in r203364 introduced an increment past the
end of a range in -objc-arc-contract. Added an explicit check for the
end of the range.
<rdar://problem/16333235>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204195 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/ObjCARC')
| -rw-r--r-- | lib/Transforms/ObjCARC/ObjCARCContract.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Transforms/ObjCARC/ObjCARCContract.cpp b/lib/Transforms/ObjCARC/ObjCARCContract.cpp index 1412181766..3da5a0e6d2 100644 --- a/lib/Transforms/ObjCARC/ObjCARCContract.cpp +++ b/lib/Transforms/ObjCARC/ObjCARCContract.cpp @@ -475,8 +475,9 @@ bool ObjCARCContract::runOnFunction(Function &F) { for (unsigned i = 0, e = PHI->getNumIncomingValues(); i != e; ++i) if (PHI->getIncomingBlock(i) == BB) { // Keep the UI iterator valid. - if (&PHI->getOperandUse( - PHINode::getOperandNumForIncomingValue(i)) == &U) + if (UI != UE && + &PHI->getOperandUse( + PHINode::getOperandNumForIncomingValue(i)) == &*UI) ++UI; PHI->setIncomingValue(i, Replacement); } |