mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-11-01 15:11:24 +00:00
eliminate the SCCPSolver::getValueMapping method.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85778 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
301a2792be
commit
8db50122a4
@ -236,10 +236,10 @@ public:
|
||||
return BBExecutable.count(BB);
|
||||
}
|
||||
|
||||
/// getValueMapping - Once we have solved for constants, return the mapping of
|
||||
/// LLVM values to LatticeVals.
|
||||
std::map<Value*, LatticeVal> &getValueMapping() {
|
||||
return ValueState;
|
||||
LatticeVal getLatticeValueFor(Value *V) const {
|
||||
std::map<Value*, LatticeVal>::const_iterator I = ValueState.find(V);
|
||||
assert(I != ValueState.end() && "V is not in valuemap!");
|
||||
return I->second;
|
||||
}
|
||||
|
||||
/// getTrackedRetVals - Get the inferred return value map.
|
||||
@ -1612,8 +1612,6 @@ bool SCCP::runOnFunction(Function &F) {
|
||||
// If we decided that there are basic blocks that are dead in this function,
|
||||
// delete their contents now. Note that we cannot actually delete the blocks,
|
||||
// as we cannot modify the CFG of the function.
|
||||
//
|
||||
std::map<Value*, LatticeVal> &Values = Solver.getValueMapping();
|
||||
|
||||
for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) {
|
||||
if (!Solver.isBlockExecutable(BB)) {
|
||||
@ -1630,8 +1628,8 @@ bool SCCP::runOnFunction(Function &F) {
|
||||
if (Inst->getType()->isVoidTy() || isa<TerminatorInst>(Inst))
|
||||
continue;
|
||||
|
||||
LatticeVal &IV = Values[Inst];
|
||||
if (!IV.isConstant() && !IV.isUndefined())
|
||||
LatticeVal IV = Solver.getLatticeValueFor(Inst);
|
||||
if (IV.isOverdefined())
|
||||
continue;
|
||||
|
||||
Constant *Const = IV.isConstant()
|
||||
@ -1743,14 +1741,15 @@ bool IPSCCP::runOnModule(Module &M) {
|
||||
// constants if we have found them to be of constant values.
|
||||
//
|
||||
SmallVector<BasicBlock*, 512> BlocksToErase;
|
||||
std::map<Value*, LatticeVal> &Values = Solver.getValueMapping();
|
||||
|
||||
for (Module::iterator F = M.begin(), E = M.end(); F != E; ++F) {
|
||||
for (Function::arg_iterator AI = F->arg_begin(), E = F->arg_end();
|
||||
AI != E; ++AI)
|
||||
if (!AI->use_empty()) {
|
||||
LatticeVal &IV = Values[AI];
|
||||
if (IV.isConstant() || IV.isUndefined()) {
|
||||
AI != E; ++AI) {
|
||||
if (AI->use_empty()) continue;
|
||||
|
||||
LatticeVal IV = Solver.getLatticeValueFor(AI);
|
||||
if (IV.isOverdefined()) continue;
|
||||
|
||||
Constant *CST = IV.isConstant() ?
|
||||
IV.getConstant() : UndefValue::get(AI->getType());
|
||||
DEBUG(errs() << "*** Arg " << *AI << " = " << *CST <<"\n");
|
||||
@ -1760,7 +1759,6 @@ bool IPSCCP::runOnModule(Module &M) {
|
||||
AI->replaceAllUsesWith(CST);
|
||||
++IPNumArgsElimed;
|
||||
}
|
||||
}
|
||||
|
||||
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
|
||||
if (!Solver.isBlockExecutable(BB)) {
|
||||
@ -1789,8 +1787,8 @@ bool IPSCCP::runOnModule(Module &M) {
|
||||
if (Inst->getType()->isVoidTy())
|
||||
continue;
|
||||
|
||||
LatticeVal &IV = Values[Inst];
|
||||
if (!IV.isConstant() && !IV.isUndefined())
|
||||
LatticeVal IV = Solver.getLatticeValueFor(Inst);
|
||||
if (IV.isOverdefined())
|
||||
continue;
|
||||
|
||||
Constant *Const = IV.isConstant()
|
||||
|
Loading…
Reference in New Issue
Block a user