[llvm-commits] [llvm] r93045 - in /llvm/trunk: lib/Transforms/Scalar/Reassociate.cpp test/Transforms/Reassociate/crash.ll

[Chris Lattner]

Author: lattner
Date: Sat Jan  9 00:01:36 2010
New Revision: 93045

URL: http://llvm.org/viewvc/llvm-project?rev=93045&view=rev
Log:
only factor from expressions whose uses are empty and whose
base is the right expression type.  This fixes PR5981.

Modified:
    llvm/trunk/lib/Transforms/Scalar/Reassociate.cpp
    llvm/trunk/test/Transforms/Reassociate/crash.ll

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/Reassociate.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/Reassociate.cpp Sat Jan  9 00:01:36 2010
@@ -792,6 +792,11 @@
     Instruction *DummyInst = BinaryOperator::CreateAdd(MaxOccVal, MaxOccVal);
     SmallVector<Value*, 4> NewMulOps;
     for (unsigned i = 0, e = Ops.size(); i != e; ++i) {
+      // Only try to remove factors from expressions we're allowed to.
+      BinaryOperator *BOp = dyn_cast<BinaryOperator>(Ops[i].Op);
+      if (BOp == 0 || BOp->getOpcode() != Instruction::Mul || !BOp->use_empty())
+        continue;
+      
       if (Value *V = RemoveFactorFromExpression(Ops[i].Op, MaxOccVal)) {
         NewMulOps.push_back(V);
         Ops.erase(Ops.begin()+i);

Modified: llvm/trunk/test/Transforms/Reassociate/crash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Reassociate/crash.ll?rev=93045&r1=93044&r2=93045&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/Reassociate/crash.ll (original)
+++ llvm/trunk/test/Transforms/Reassociate/crash.ll Sat Jan  9 00:01:36 2010
@@ -2,7 +2,7 @@
 
 
 ; rdar://7507855
-define fastcc i32 @test() nounwind {
+define fastcc i32 @test1() nounwind {
 entry:
   %cond = select i1 undef, i32 1, i32 -1          ; <i32> [#uses=2]
   br label %for.cond
@@ -13,3 +13,21 @@
   %add896 = sub i32 0, %cond                      ; <i32> [#uses=0]
   ret i32 undef
 }
+
+; PR5981
+define i32 @test2() nounwind ssp {
+entry:
+  %0 = load i32* undef, align 4
+  %1 = mul nsw i32 undef, %0
+  %2 = mul nsw i32 undef, %0
+  %3 = add nsw i32 undef, %1
+  %4 = add nsw i32 %3, %2
+  %5 = add nsw i32 %4, 4
+  %6 = shl i32 %0, 3                              ; <i32> [#uses=1]
+  %7 = add nsw i32 %5, %6
+  br label %bb4.i9
+
+bb4.i9:                                           ; preds = %bb3.i7, %bb1.i25.i
+  %8 = add nsw i32 undef, %1
+  ret i32 0
+}