6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 18:29:45 +00:00
Code Issues Projects Releases Wiki Activity

make sure that PHITransAddr keeps its 'InstInputs' list up to

Browse Source 
date when instsimplify kicks in.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@90901 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-12-08 23:42:51 +00:00
parent 0000fadb00
commit 43678f41a3
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Analysis/PHITransAddr.h
View File

@ -98,6 +98,11 @@ private:
Value *InsertPHITranslatedSubExpr(Value *InVal, BasicBlock *CurBB,
BasicBlock *PredBB, const DominatorTree &DT,
SmallVectorImpl<Instruction*> &NewInsts);
/// ReplaceInstWithValue - Remove any instruction inputs in the InstInputs
/// array that are due to the specified instruction that is about to be
/// removed from the address, and add any corresponding to V. This returns V.
Value *ReplaceInstWithValue(Instruction *I, Value *V);
};
} // end namespace llvm

45
lib/Analysis/PHITransAddr.cpp
View File

@ -43,6 +43,44 @@ bool PHITransAddr::IsPotentiallyPHITranslatable() const {
}
static void RemoveInstInputs(Instruction *I,
SmallVectorImpl<Instruction*> &InstInputs) {
// If the instruction is in the InstInputs list, remove it.
SmallVectorImpl<Instruction*>::iterator Entry =
std::find(InstInputs.begin(), InstInputs.end(), I);
if (Entry != InstInputs.end()) {
InstInputs.erase(Entry);
return;
}
// Otherwise, it must have instruction inputs itself. Zap them recursively.
bool HadInstInputs = false;
for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i) {
if (Instruction *Op = dyn_cast<Instruction>(I->getOperand(i))) {
RemoveInstInputs(Op, InstInputs);
HadInstInputs = true;
}
}
// This instruction had to have operands in the instinputs list or it should
// have been in the list itself. If not, the list is broken.
assert(HadInstInputs && "InstInputs list inconsistent!");
}
/// ReplaceInstWithValue - Remove any instruction inputs in the InstInputs
/// array that are due to the specified instruction that is about to be
/// removed from the address, and add any corresponding to V. This returns V.
Value *PHITransAddr::ReplaceInstWithValue(Instruction *I, Value *V) {
// Remove the old instruction from InstInputs.
RemoveInstInputs(I, InstInputs);
// If V is an instruction, it is now an input.
if (Instruction *VI = dyn_cast<Instruction>(V))
InstInputs.push_back(VI);
return V;
}
Value *PHITransAddr::PHITranslateSubExpr(Value *V, BasicBlock *CurBB,
BasicBlock *PredBB) {
// If this is a non-instruction value, it can't require PHI translation.
@ -98,7 +136,8 @@ Value *PHITransAddr::PHITranslateSubExpr(Value *V, BasicBlock *CurBB,
// Constants are trivial to find.
if (Constant *C = dyn_cast<Constant>(PHIIn))
return ConstantExpr::getBitCast(C, BC->getType());
return ReplaceInstWithValue(BC, ConstantExpr::getBitCast(C,
BC->getType()));
// Otherwise we have to see if a bitcasted version of the incoming pointer
// is available. If so, we can use it, otherwise we have to fail.
@ -129,7 +168,7 @@ Value *PHITransAddr::PHITranslateSubExpr(Value *V, BasicBlock *CurBB,
// Simplify the GEP to handle 'gep x, 0' -> x etc.
if (Value *V = SimplifyGEPInst(&GEPOps[0], GEPOps.size(), TD))
return V;
return ReplaceInstWithValue(GEP, V);
// Scan to see if we have this GEP available.
Value *APHIOp = GEPOps[0];
@ -174,7 +213,7 @@ Value *PHITransAddr::PHITranslateSubExpr(Value *V, BasicBlock *CurBB,
// See if the add simplifies away.
if (Value *Res = SimplifyAddInst(LHS, RHS, isNSW, isNUW, TD))
return Res;
return ReplaceInstWithValue(Inst, Res);
// Otherwise, see if we have this add available somewhere.
for (Value::use_iterator UI = LHS->use_begin(), E = LHS->use_end();