Do not split loops rejected by processOneIterationLoop().
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41194 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Scalar/LoopIndexSplit.cpp b/lib/Transforms/Scalar/LoopIndexSplit.cpp
index 9b4319d..4a5c1c8 100644
--- a/lib/Transforms/Scalar/LoopIndexSplit.cpp
+++ b/lib/Transforms/Scalar/LoopIndexSplit.cpp
@@ -178,7 +178,7 @@
// First see if it is possible to eliminate loop itself or not.
for (SmallVector<SplitInfo, 4>::iterator SI = SplitData.begin(),
- E = SplitData.end(); SI != E; ++SI) {
+ E = SplitData.end(); SI != E;) {
SplitInfo &SD = *SI;
if (SD.SplitCondition->getPredicate() == ICmpInst::ICMP_EQ) {
Changed = processOneIterationLoop(SD);
@@ -186,8 +186,13 @@
++NumIndexSplit;
// If is loop is eliminated then nothing else to do here.
return Changed;
+ } else {
+ SmallVector<SplitInfo, 4>::iterator Delete_SI = SI;
+ ++SI;
+ SplitData.erase(Delete_SI);
}
- }
+ } else
+ ++SI;
}
unsigned MaxCost = 99;
@@ -198,8 +203,8 @@
SplitInfo SD = *SI;
// ICM_EQs are already handled above.
- if (SD.SplitCondition->getPredicate() == ICmpInst::ICMP_EQ)
- continue;
+ assert (SD.SplitCondition->getPredicate() != ICmpInst::ICMP_EQ &&
+ "Unexpected split condition predicate");
unsigned Cost = findSplitCost(L, SD);
if (Cost < MaxCost)
@@ -207,7 +212,8 @@
}
// Split most profitiable condition.
- Changed = splitLoop(SplitData[MostProfitableSDIndex]);
+ if (!SplitData.empty())
+ Changed = splitLoop(SplitData[MostProfitableSDIndex]);
if (Changed)
++NumIndexSplit;