RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-02 09:49:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some bugs in code I didn't mean to check in.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19534 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2005-01-13 20:40:58 +00:00
parent 574da9ba0b
commit 5bdf04cc8e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -2112,6 +2112,7 @@ static Value *EmitGEPOffset(User *GEP, Instruction &I, InstCombiner &IC) {
SIntPtrTy); SIntPtrTy);
if (Constant *OpC = dyn_cast<Constant>(Op)) { if (Constant *OpC = dyn_cast<Constant>(Op)) {
if (!OpC->isNullValue()) { if (!OpC->isNullValue()) {
OpC = ConstantExpr::getCast(OpC, SIntPtrTy);
Scale = ConstantExpr::getMul(OpC, Scale); Scale = ConstantExpr::getMul(OpC, Scale);
if (Constant *RC = dyn_cast<Constant>(Result)) if (Constant *RC = dyn_cast<Constant>(Result))
Result = ConstantExpr::getAdd(RC, Scale); Result = ConstantExpr::getAdd(RC, Scale);
@ -2123,13 +2124,19 @@ static Value *EmitGEPOffset(User *GEP, Instruction &I, InstCombiner &IC) {
} }
} }
} else { } else {
// We'll let instcombine(mul) convert this to a shl if possible. //if (Op->getType() != Scale->getType())
Value *Offs = if (Size != 1) {
IC.InsertNewInstBefore(BinaryOperator::createMul(Op, Scale, // Convert to correct type.
GEP->getName()+".idx"), I); 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. // Emit an add instruction.
Result = IC.InsertNewInstBefore(BinaryOperator::createAdd(Offs, Result, Result = IC.InsertNewInstBefore(BinaryOperator::createAdd(Op, Result,
GEP->getName()+".offs"), I); GEP->getName()+".offs"), I);
} }
} }