From 98bda3dfefcb08e6ce81fa9545b05eb433cd5b87 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 4 May 2012 04:22:32 +0000 Subject: Add 'landingpad' instructions to the list of instructions to ignore. Also combine the code in the 'assert' statement. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@156155 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/Reassociate.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/Transforms/Scalar/Reassociate.cpp b/lib/Transforms/Scalar/Reassociate.cpp index 577a143..cc98ba0 100644 --- a/lib/Transforms/Scalar/Reassociate.cpp +++ b/lib/Transforms/Scalar/Reassociate.cpp @@ -175,6 +175,7 @@ void Reassociate::RemoveDeadBinaryOp(Value *V) { static bool isUnmovableInstruction(Instruction *I) { if (I->getOpcode() == Instruction::PHI || + I->getOpcode() == Instruction::LandingPad || I->getOpcode() == Instruction::Alloca || I->getOpcode() == Instruction::Load || I->getOpcode() == Instruction::Invoke || @@ -272,13 +273,14 @@ static Instruction *LowerNegateToMultiply(Instruction *Neg, // linearize it as well. Besides that case, this does not recurse into A,B, or // C. void Reassociate::LinearizeExpr(BinaryOperator *I) { - BinaryOperator *LHS = cast(I->getOperand(0)); - BinaryOperator *RHS = cast(I->getOperand(1)); - assert(isReassociableOp(LHS, I->getOpcode()) && - isReassociableOp(RHS, I->getOpcode()) && - "Not an expression that needs linearization?"); - - DEBUG(dbgs() << "Linear" << *LHS << '\n' << *RHS << '\n' << *I << '\n'); + BinaryOperator *LHS = isReassociableOp(I->getOperand(0), I->getOpcode()); + BinaryOperator *RHS = isReassociableOp(I->getOperand(1), I->getOpcode()); + assert(LHS && RHS && "Not an expression that needs linearization?"); + + DEBUG({ + dbgs() << "Linear:\n"; + dbgs() << '\t' << *LHS << "\t\n" << *RHS << "\t\n" << *I << '\n'; + }); // Move the RHS instruction to live immediately before I, avoiding breaking // dominator properties. -- cgit v1.1