Use SCEVExpander::InsertCastOfTo instead of calling new IntToPtrInst

directly, because the insert point used by the SCEVExpander may vary
from what LSR originally computes.

llvm-svn: 40641
This commit is contained in:
Dan Gohman 2007-07-31 17:22:27 +00:00
parent 5a3594de20
commit 7702c23d4a

View File

@ -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());
}
}