diff options
Diffstat (limited to 'lib/Transforms/Scalar')
| -rw-r--r-- | lib/Transforms/Scalar/ConstantProp.cpp | 6 | ||||
| -rw-r--r-- | lib/Transforms/Scalar/InductionVars.cpp | 8 | ||||
| -rw-r--r-- | lib/Transforms/Scalar/SCCP.cpp | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/Transforms/Scalar/ConstantProp.cpp b/lib/Transforms/Scalar/ConstantProp.cpp index 91a21c3..f6b76c9 100644 --- a/lib/Transforms/Scalar/ConstantProp.cpp +++ b/lib/Transforms/Scalar/ConstantProp.cpp @@ -73,7 +73,7 @@ inline static bool ConstantFoldUnaryInst(Method *M, Method::inst_iterator &DI, UnaryOperator *Op, ConstPoolVal *D) { ConstPoolVal *ReplaceWith = - opt::ConstantFoldUnaryInstruction(Op->getInstType(), D); + opt::ConstantFoldUnaryInstruction(Op->getOpcode(), D); if (!ReplaceWith) return false; // Nothing new to change... @@ -100,7 +100,7 @@ ConstantFoldBinaryInst(Method *M, Method::inst_iterator &DI, BinaryOperator *Op, ConstPoolVal *D1, ConstPoolVal *D2) { ConstPoolVal *ReplaceWith = - opt::ConstantFoldBinaryInstruction(Op->getInstType(), D1, D2); + opt::ConstantFoldBinaryInstruction(Op->getOpcode(), D1, D2); if (!ReplaceWith) return false; // Nothing new to change... // Add the new value to the constant pool... @@ -126,7 +126,7 @@ ConstantFoldBinaryInst(Method *M, Method::inst_iterator &DI, // bool opt::ConstantFoldTerminator(TerminatorInst *T) { // Branch - See if we are conditional jumping on constant - if (T->getInstType() == Instruction::Br) { + if (T->getOpcode() == Instruction::Br) { BranchInst *BI = (BranchInst*)T; if (BI->isUnconditional()) return false; // Can't optimize uncond branch BasicBlock *Dest1 = BI->getOperand(0)->castBasicBlockAsserting(); diff --git a/lib/Transforms/Scalar/InductionVars.cpp b/lib/Transforms/Scalar/InductionVars.cpp index b39a523..c59a441 100644 --- a/lib/Transforms/Scalar/InductionVars.cpp +++ b/lib/Transforms/Scalar/InductionVars.cpp @@ -78,7 +78,7 @@ static LIVType isLinearInductionVariableH(cfg::Interval *Int, Value *V, // loop variant computations must be instructions! Instruction *I = V->castInstructionAsserting(); - switch (I->getInstType()) { // Handle each instruction seperately + switch (I->getOpcode()) { // Handle each instruction seperately case Instruction::Neg: { Value *SubV = ((UnaryOperator*)I)->getOperand(0); LIVType SubLIVType = isLinearInductionVariableH(Int, SubV, PN); @@ -107,12 +107,12 @@ static LIVType isLinearInductionVariableH(cfg::Interval *Int, Value *V, // either a Loop Invariant computation, or a LIV type. if (SubLIVType1 == isLIC) { // Loop invariant computation, we know this is a LIV then. - return (I->getInstType() == Instruction::Add) ? + return (I->getOpcode() == Instruction::Add) ? SubLIVType2 : neg(SubLIVType2); } // If the LHS is also a LIV Expression, we cannot add two LIVs together - if (I->getInstType() == Instruction::Add) return isOther; + if (I->getOpcode() == Instruction::Add) return isOther; // We can only subtract two LIVs if they are the same type, which yields // a LIC, because the LIVs cancel each other out. @@ -155,7 +155,7 @@ static inline bool isSimpleInductionVar(PHINode *PN) { Value *StepExpr = PN->getIncomingValue(1); if (!StepExpr->isInstruction() || - ((Instruction*)StepExpr)->getInstType() != Instruction::Add) + ((Instruction*)StepExpr)->getOpcode() != Instruction::Add) return false; BinaryOperator *I = (BinaryOperator*)StepExpr; diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index 5bb75c7..43eb26f 100644 --- a/lib/Transforms/Scalar/SCCP.cpp +++ b/lib/Transforms/Scalar/SCCP.cpp @@ -307,7 +307,7 @@ void SCCP::UpdateInstruction(Instruction *I) { if (IValue.isOverdefined()) return; // If already overdefined, we aren't going to effect anything - switch (I->getInstType()) { + switch (I->getOpcode()) { //===-----------------------------------------------------------------===// // Handle PHI nodes... // @@ -424,7 +424,7 @@ void SCCP::UpdateInstruction(Instruction *I) { } default: break; // Handle math operators as groups. - } // end switch(I->getInstType()) + } // end switch(I->getOpcode()) //===-------------------------------------------------------------------===// @@ -437,7 +437,7 @@ void SCCP::UpdateInstruction(Instruction *I) { markOverdefined(I); } else if (VState.isConstant()) { // Propogate constant value ConstPoolVal *Result = - opt::ConstantFoldUnaryInstruction(I->getInstType(), + opt::ConstantFoldUnaryInstruction(I->getOpcode(), VState.getConstant()); if (Result) { @@ -466,7 +466,7 @@ void SCCP::UpdateInstruction(Instruction *I) { markOverdefined(I); } else if (V1State.isConstant() && V2State.isConstant()) { ConstPoolVal *Result = - opt::ConstantFoldBinaryInstruction(I->getInstType(), + opt::ConstantFoldBinaryInstruction(I->getOpcode(), V1State.getConstant(), V2State.getConstant()); if (Result) { |