diff options
| -rw-r--r-- | lib/Transforms/Scalar/LoopStrengthReduce.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/lib/Transforms/Scalar/LoopStrengthReduce.cpp index 9689c120d6..64c60ba2e6 100644 --- a/lib/Transforms/Scalar/LoopStrengthReduce.cpp +++ b/lib/Transforms/Scalar/LoopStrengthReduce.cpp @@ -596,10 +596,13 @@ void BasedUser::RewriteInstructionToUseNewBase(const SCEVHandle &NewBase, } } Value *NewVal = InsertCodeForBaseAtPosition(NewBase, Rewriter, InsertPt, L); - // Adjust the type back to match the Inst. + // Adjust the type back to match the Inst. Note that we can't use InsertPt + // here because the SCEVExpander may have inserted the instructions after + // that point, in its efforts to avoid inserting redundant expressions. if (isa<PointerType>(OperandValToReplace->getType())) { - NewVal = new IntToPtrInst(NewVal, OperandValToReplace->getType(), "cast", - InsertPt); + NewVal = SCEVExpander::InsertCastOfTo(Instruction::IntToPtr, + NewVal, + OperandValToReplace->getType()); } // Replace the use of the operand Value with the new Phi we just created. Inst->replaceUsesOfWith(OperandValToReplace, NewVal); @@ -648,9 +651,13 @@ void BasedUser::RewriteInstructionToUseNewBase(const SCEVHandle &NewBase, Instruction *InsertPt = PN->getIncomingBlock(i)->getTerminator(); Code = InsertCodeForBaseAtPosition(NewBase, Rewriter, InsertPt, L); - // Adjust the type back to match the PHI. + // Adjust the type back to match the PHI. Note that we can't use InsertPt + // here because the SCEVExpander may have inserted its instructions after + // that point, in its efforts to avoid inserting redundant expressions. if (isa<PointerType>(PN->getType())) { - Code = new IntToPtrInst(Code, PN->getType(), "cast", InsertPt); + Code = SCEVExpander::InsertCastOfTo(Instruction::IntToPtr, + Code, + PN->getType()); } } |