[llvm-commits] [llvm] r41194 - in /llvm/trunk: lib/Transforms/Scalar/LoopIndexSplit.cpp test/Transforms/LoopIndexSplit/Crash-2007-08-17.ll test/Transforms/LoopIndexSplit/Crash2-2007-08-17.ll

[Devang Patel]

Author: dpatel
Date: Mon Aug 20 15:24:15 2007
New Revision: 41194

URL: http://llvm.org/viewvc/llvm-project?rev=41194&view=rev
Log:
Do not split loops rejected by processOneIterationLoop().

Modified:
    llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp
    llvm/trunk/test/Transforms/LoopIndexSplit/Crash-2007-08-17.ll
    llvm/trunk/test/Transforms/LoopIndexSplit/Crash2-2007-08-17.ll

Modified: llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp?rev=41194&r1=41193&r2=41194&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp Mon Aug 20 15:24:15 2007
@@ -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;

Modified: llvm/trunk/test/Transforms/LoopIndexSplit/Crash-2007-08-17.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIndexSplit/Crash-2007-08-17.ll?rev=41194&r1=41193&r2=41194&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/LoopIndexSplit/Crash-2007-08-17.ll (original)
+++ llvm/trunk/test/Transforms/LoopIndexSplit/Crash-2007-08-17.ll Mon Aug 20 15:24:15 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-index-split -disable-output -stats |& \
-; RUN: grep "loop-index-split" | count 1
+; RUN: llvm-as < %s | opt -loop-index-split -disable-output 
 
         %struct._edit_script = type { %struct._edit_script*, i32, i8 }
 

Modified: llvm/trunk/test/Transforms/LoopIndexSplit/Crash2-2007-08-17.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIndexSplit/Crash2-2007-08-17.ll?rev=41194&r1=41193&r2=41194&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/LoopIndexSplit/Crash2-2007-08-17.ll (original)
+++ llvm/trunk/test/Transforms/LoopIndexSplit/Crash2-2007-08-17.ll Mon Aug 20 15:24:15 2007
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-index-split -disable-output -stats |& \
-; RUN: grep "loop-index-split" | count 1
+; RUN: llvm-as < %s | opt -loop-index-split -disable-output 
 
         %struct._edit_script = type { %struct._edit_script*, i32, i8 }