mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
Convert SimplifyGEPInst to use ArrayRef.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135482 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
ca12a2139e
commit
b9b54ebfed
@ -648,6 +648,7 @@ from the previous release.</p>
|
||||
<li><code>MDNode::getIfExists</code></li>
|
||||
<li><code>MDNode::getTemporary</code></li>
|
||||
<li><code>MDNode::getWhenValsUnresolved</code></li>
|
||||
<li><code>SimplifyGEPInst</code> (in <code>llvm/Analysis/InstructionSimplify.h</code>)</li>
|
||||
<li><code>TargetData::getIndexedOffset</code></li>
|
||||
</ul></li>
|
||||
|
||||
|
@ -24,6 +24,8 @@ namespace llvm {
|
||||
class Instruction;
|
||||
class Value;
|
||||
class TargetData;
|
||||
template<typename T>
|
||||
class ArrayRef;
|
||||
|
||||
/// SimplifyAddInst - Given operands for an Add, see if we can
|
||||
/// fold the result. If not, this returns null.
|
||||
@ -121,7 +123,7 @@ namespace llvm {
|
||||
|
||||
/// SimplifyGEPInst - Given operands for an GetElementPtrInst, see if we can
|
||||
/// fold the result. If not, this returns null.
|
||||
Value *SimplifyGEPInst(Value * const *Ops, unsigned NumOps,
|
||||
Value *SimplifyGEPInst(ArrayRef<Value *> Ops,
|
||||
const TargetData *TD = 0, const DominatorTree *DT = 0);
|
||||
|
||||
//=== Helper functions for higher up the class hierarchy.
|
||||
|
@ -2219,24 +2219,24 @@ Value *llvm::SimplifySelectInst(Value *CondVal, Value *TrueVal, Value *FalseVal,
|
||||
|
||||
/// SimplifyGEPInst - Given operands for an GetElementPtrInst, see if we can
|
||||
/// fold the result. If not, this returns null.
|
||||
Value *llvm::SimplifyGEPInst(Value *const *Ops, unsigned NumOps,
|
||||
Value *llvm::SimplifyGEPInst(ArrayRef<Value *> Ops,
|
||||
const TargetData *TD, const DominatorTree *) {
|
||||
// The type of the GEP pointer operand.
|
||||
PointerType *PtrTy = cast<PointerType>(Ops[0]->getType());
|
||||
|
||||
// getelementptr P -> P.
|
||||
if (NumOps == 1)
|
||||
if (Ops.size() == 1)
|
||||
return Ops[0];
|
||||
|
||||
if (isa<UndefValue>(Ops[0])) {
|
||||
// Compute the (pointer) type returned by the GEP instruction.
|
||||
Type *LastType = GetElementPtrInst::getIndexedType(PtrTy, &Ops[1],
|
||||
NumOps-1);
|
||||
Type *LastType = GetElementPtrInst::getIndexedType(PtrTy, Ops.data() + 1,
|
||||
Ops.size() - 1);
|
||||
Type *GEPTy = PointerType::get(LastType, PtrTy->getAddressSpace());
|
||||
return UndefValue::get(GEPTy);
|
||||
}
|
||||
|
||||
if (NumOps == 2) {
|
||||
if (Ops.size() == 2) {
|
||||
// getelementptr P, 0 -> P.
|
||||
if (ConstantInt *C = dyn_cast<ConstantInt>(Ops[1]))
|
||||
if (C->isZero())
|
||||
@ -2250,12 +2250,13 @@ Value *llvm::SimplifyGEPInst(Value *const *Ops, unsigned NumOps,
|
||||
}
|
||||
|
||||
// Check to see if this is constant foldable.
|
||||
for (unsigned i = 0; i != NumOps; ++i)
|
||||
for (unsigned i = 0, e = Ops.size(); i != e; ++i)
|
||||
if (!isa<Constant>(Ops[i]))
|
||||
return 0;
|
||||
|
||||
return ConstantExpr::getGetElementPtr(cast<Constant>(Ops[0]),
|
||||
(Constant *const*)Ops+1, NumOps-1);
|
||||
(Constant *const*)Ops.data() + 1,
|
||||
Ops.size() - 1);
|
||||
}
|
||||
|
||||
/// SimplifyPHINode - See if we can fold the given phi. If not, returns null.
|
||||
@ -2456,7 +2457,7 @@ Value *llvm::SimplifyInstruction(Instruction *I, const TargetData *TD,
|
||||
break;
|
||||
case Instruction::GetElementPtr: {
|
||||
SmallVector<Value*, 8> Ops(I->op_begin(), I->op_end());
|
||||
Result = SimplifyGEPInst(&Ops[0], Ops.size(), TD, DT);
|
||||
Result = SimplifyGEPInst(Ops, TD, DT);
|
||||
break;
|
||||
}
|
||||
case Instruction::PHI:
|
||||
|
@ -228,7 +228,7 @@ Value *PHITransAddr::PHITranslateSubExpr(Value *V, BasicBlock *CurBB,
|
||||
return GEP;
|
||||
|
||||
// Simplify the GEP to handle 'gep x, 0' -> x etc.
|
||||
if (Value *V = SimplifyGEPInst(&GEPOps[0], GEPOps.size(), TD, DT)) {
|
||||
if (Value *V = SimplifyGEPInst(GEPOps, TD, DT)) {
|
||||
for (unsigned i = 0, e = GEPOps.size(); i != e; ++i)
|
||||
RemoveInstInputs(GEPOps[i], InstInputs);
|
||||
|
||||
|
@ -742,7 +742,7 @@ Type *InstCombiner::FindElementAtOffset(Type *Ty, int64_t Offset,
|
||||
Instruction *InstCombiner::visitGetElementPtrInst(GetElementPtrInst &GEP) {
|
||||
SmallVector<Value*, 8> Ops(GEP.op_begin(), GEP.op_end());
|
||||
|
||||
if (Value *V = SimplifyGEPInst(&Ops[0], Ops.size(), TD))
|
||||
if (Value *V = SimplifyGEPInst(Ops, TD))
|
||||
return ReplaceInstUsesWith(GEP, V);
|
||||
|
||||
Value *PtrOp = GEP.getOperand(0);
|
||||
|
Loading…
Reference in New Issue
Block a user