Fix SCEVExpander assert during LSR: "argument of incompatible type".
Just because we're dealing with a GEP doesn't mean we can assert the
SCEV has a pointer type. The fix is simply to ignore the SCEV pointer
type, which we really didn't need.
Fixes PR11138 webkit crash.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142058 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/ScalarEvolutionExpander.cpp b/lib/Analysis/ScalarEvolutionExpander.cpp
index e76b6b1..47f0f32 100644
--- a/lib/Analysis/ScalarEvolutionExpander.cpp
+++ b/lib/Analysis/ScalarEvolutionExpander.cpp
@@ -881,7 +881,7 @@
/// should match any patterns generated by getAddRecExprPHILiterally and
/// expandAddtoGEP.
bool SCEVExpander::isExpandedAddRecExprPHI(PHINode *PN, Instruction *IncV,
- const Loop *L, Type *ExpandTy) {
+ const Loop *L) {
switch (IncV->getOpcode()) {
// Check for a simple Add/Sub or GEP of a loop invariant step.
case Instruction::Add:
@@ -904,7 +904,7 @@
// i1* is used by the expander to represent an address-size element.
if (IncV->getNumOperands() != 2)
return false;
- unsigned AS = cast<PointerType>(ExpandTy)->getAddressSpace();
+ unsigned AS = cast<PointerType>(IncV->getType())->getAddressSpace();
if (IncV->getType() != Type::getInt1PtrTy(SE.getContext(), AS)
&& IncV->getType() != Type::getInt8PtrTy(SE.getContext(), AS))
return false;
@@ -954,7 +954,7 @@
cast<Instruction>(PN->getIncomingValueForBlock(LatchBlock));
if (LSRMode) {
- if (!isExpandedAddRecExprPHI(PN, IncV, L, ExpandTy))
+ if (!isExpandedAddRecExprPHI(PN, IncV, L))
continue;
}
else {
@@ -1547,9 +1547,8 @@
cast<Instruction>(Phi->getIncomingValueForBlock(LatchBlock));
// If this phi is more canonical, swap it with the original.
- if (!isExpandedAddRecExprPHI(OrigPhiRef, OrigInc, L,
- OrigPhiRef->getType())
- && isExpandedAddRecExprPHI(Phi, IsomorphicInc, L, Phi->getType())) {
+ if (!isExpandedAddRecExprPHI(OrigPhiRef, OrigInc, L)
+ && isExpandedAddRecExprPHI(Phi, IsomorphicInc, L)) {
std::swap(OrigPhiRef, Phi);
std::swap(OrigInc, IsomorphicInc);
}