6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-28 09:31:03 +00:00
Code Issues Projects Releases Wiki Activity

[Constant Hoisting] Don't update the use list while traversing it - DOH!

Browse Source 
This fix first traverses the whole use list of the constant expression and
keeps track of the instructions that need to be updated. Then perform the
fixup afterwards.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201008 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Juergen Ributzka 2014-02-08 00:20:45 +00:00
parent 3365433e45
commit 1368e659d7
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Transforms/Scalar/ConstantHoisting.cpp
View File

@ -350,14 +350,19 @@ void ConstantHoisting::EmitBaseConstants(Function &F, User *U,
}
assert(isa<ConstantExpr>(U) && "Expected a ConstantExpr.");
ConstantExpr *CE = cast<ConstantExpr>(U);
SmallVector<std::pair<Instruction *, Instruction *>, 8> WorkList;
DEBUG(dbgs() << "Visit ConstantExpr " << *CE << '\n');
for (Value::use_iterator UU = CE->use_begin(), E = CE->use_end();
UU != E; ++UU) {
DEBUG(dbgs() << "Check user "; UU->print(dbgs()); dbgs() << '\n');
// We only handel instructions here and won't walk down a ConstantExpr chain
// to replace all ConstExpr with instructions.
if (Instruction *I = dyn_cast<Instruction>(*UU)) {
// Only update constant expressions in the current function.
if (I->getParent()->getParent() != &F)
if (I->getParent()->getParent() != &F) {
DEBUG(dbgs() << "Not in the same function - skip.\n");
continue;
}
Instruction *Mat = Base;
Instruction *InsertBefore = getMatInsertPt(I, DT);
@ -380,12 +385,18 @@ void ConstantHoisting::EmitBaseConstants(Function &F, User *U,
// Use the same debug location as the instruction we are about to update.
ICE->setDebugLoc(I->getDebugLoc());
DEBUG(dbgs() << "Create instruction: " << *ICE << '\n');
DEBUG(dbgs() << "Update: " << *I << '\n');
I->replaceUsesOfWith(CE, ICE);
DEBUG(dbgs() << "To: " << *I << '\n');
WorkList.push_back(std::make_pair(I, ICE));
} else {
DEBUG(dbgs() << "Not an instruction - skip.\n");
}
}
SmallVectorImpl<std::pair<Instruction *, Instruction *> >::iterator I, E;
for (I = WorkList.begin(), E = WorkList.end(); I != E; ++I) {
DEBUG(dbgs() << "Create instruction: " << *I->second << '\n');
DEBUG(dbgs() << "Update: " << *I->first << '\n');
I->first->replaceUsesOfWith(CE, I->second);
DEBUG(dbgs() << "To: " << *I->first << '\n');
}
}
/// \brief Hoist and hide the base constant behind a bitcast and emit