mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-30 08:24:12 +00:00
Fix some bugs in code I didn't mean to check in.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19534 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
574da9ba0b
commit
5bdf04cc8e
@ -2112,6 +2112,7 @@ static Value *EmitGEPOffset(User *GEP, Instruction &I, InstCombiner &IC) {
|
||||
SIntPtrTy);
|
||||
if (Constant *OpC = dyn_cast<Constant>(Op)) {
|
||||
if (!OpC->isNullValue()) {
|
||||
OpC = ConstantExpr::getCast(OpC, SIntPtrTy);
|
||||
Scale = ConstantExpr::getMul(OpC, Scale);
|
||||
if (Constant *RC = dyn_cast<Constant>(Result))
|
||||
Result = ConstantExpr::getAdd(RC, Scale);
|
||||
@ -2123,13 +2124,19 @@ static Value *EmitGEPOffset(User *GEP, Instruction &I, InstCombiner &IC) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// We'll let instcombine(mul) convert this to a shl if possible.
|
||||
Value *Offs =
|
||||
IC.InsertNewInstBefore(BinaryOperator::createMul(Op, Scale,
|
||||
GEP->getName()+".idx"), I);
|
||||
//if (Op->getType() != Scale->getType())
|
||||
if (Size != 1) {
|
||||
// Convert to correct type.
|
||||
Op = IC.InsertNewInstBefore(new CastInst(Op, SIntPtrTy,
|
||||
Op->getName()+".c"), I);
|
||||
|
||||
// We'll let instcombine(mul) convert this to a shl if possible.
|
||||
Op = IC.InsertNewInstBefore(BinaryOperator::createMul(Op, Scale,
|
||||
GEP->getName()+".idx"), I);
|
||||
}
|
||||
|
||||
// Emit an add instruction.
|
||||
Result = IC.InsertNewInstBefore(BinaryOperator::createAdd(Offs, Result,
|
||||
Result = IC.InsertNewInstBefore(BinaryOperator::createAdd(Op, Result,
|
||||
GEP->getName()+".offs"), I);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user