Changes in directory llvm/lib/Transforms/Scalar:
InstructionCombining.cpp updated: 1.622 -> 1.623
---
Log message:
Remove dead code and fix indentation per Chris' review comments.
---
Diffs of the changes: (+12 -31)
InstructionCombining.cpp | 43 ++++++++++++-------------------------------
1 files changed, 12 insertions(+), 31 deletions(-)
Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.622
llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.623
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.622 Fri Feb 2
08:08:20 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp Fri Feb 2 08:41:37 2007
@@ -4605,16 +4605,6 @@
if (Shift && !Shift->isShift())
Shift = 0;
- // Check to see if there is a noop-cast between the shift and the
and.
- if (!Shift) {
- if (CastInst *CI = dyn_cast<CastInst>(LHSI->getOperand(0)))
- if (CI->getOpcode() == Instruction::BitCast) {
- Shift = dyn_cast<BinaryOperator>(CI->getOperand(0));
- if (Shift && !Shift->isShift())
- Shift = 0;
- }
- }
-
ConstantInt *ShAmt;
ShAmt = Shift ? dyn_cast<ConstantInt>(Shift->getOperand(1)) : 0;
const Type *Ty = Shift ? Shift->getType() : 0; // Type of the shift.
@@ -5487,7 +5477,7 @@
case Instruction::Add:
case Instruction::And:
case Instruction::Or:
- case Instruction::Xor:
+ case Instruction::Xor: {
// These operators commute.
// Turn (Y + (X >> C)) << C -> (X + (Y << C)) & (~0 << C)
if (isLeftShift && Op0BO->getOperand(1)->hasOneUse() &&
@@ -5507,10 +5497,11 @@
}
// Turn (Y + ((X >> C) & CC)) << C -> ((X & (CC << C)) + (Y << C))
- if (isLeftShift && Op0BO->getOperand(1)->hasOneUse() &&
- match(Op0BO->getOperand(1), m_And(m_Shr(m_Value(V1),
m_Value(V2)),
- m_ConstantInt(CC))) && V2 == Op1 &&
- cast<BinaryOperator>(Op0BO->getOperand(1))->getOperand(0)->hasOneUse()) {
+ Value *Op0BOOp1 = Op0BO->getOperand(1);
+ if (isLeftShift && Op0BOOp1->hasOneUse() && V2 == Op1 &&
+ match(Op0BOOp1,
+ m_And(m_Shr(m_Value(V1), m_Value(V2)),m_ConstantInt(CC)))
&&
+ cast<BinaryOperator>(Op0BOOp1)->getOperand(0)-> hasOneUse()) {
Instruction *YS = BinaryOperator::createShl(
Op0BO->getOperand(0), Op1,
Op0BO->getName());
@@ -5522,9 +5513,10 @@
return BinaryOperator::create(Op0BO->getOpcode(), YS, XM);
}
+ }
- // FALL THROUGH.
- case Instruction::Sub:
+ // FALL THROUGH.
+ case Instruction::Sub: {
// Turn ((X >> C) + Y) << C -> (X + (Y << C)) & (~0 << C)
if (isLeftShift && Op0BO->getOperand(0)->hasOneUse() &&
match(Op0BO->getOperand(0),
@@ -5562,6 +5554,7 @@
}
break;
+ }
}
@@ -5616,12 +5609,6 @@
BinaryOperator *ShiftOp = dyn_cast<BinaryOperator>(Op0);
if (ShiftOp && !ShiftOp->isShift())
ShiftOp = 0;
- if (!ShiftOp)
- if (BitCastInst *CI = dyn_cast<BitCastInst>(Op0))
- // If this is a noop-integer cast of a shift instruction, use the shift.
- if (BinaryOperator *SI = dyn_cast<BinaryOperator>(CI->getOperand(0)))
- if (SI->isShift())
- ShiftOp = SI;
if (ShiftOp && isa<ConstantInt>(ShiftOp->getOperand(1))) {
// Find the operands and properties of the input shift. Note that the
@@ -6594,14 +6581,8 @@
else
return BinaryOperator::create(BO->getOpcode(), NewSI, MatchOp);
}
-
- assert(TI->isShift() && "Should only have Shift here");
- if (MatchIsOpZero)
- return BinaryOperator::create(Instruction::BinaryOps(TI->getOpcode()),
- MatchOp, NewSI);
- else
- return BinaryOperator::create(Instruction::BinaryOps(TI->getOpcode()),
- NewSI, MatchOp);
+ assert(0 && "Shouldn't get here");
+ return 0;
}
Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
