6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-14 00:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Revert due to nightly test failures.

Browse Source 
--- Reverse-merging r152486 into '.':
U    lib/CodeGen/SjLjEHPrepare.cpp



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152571 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2012-03-12 20:19:41 +00:00
parent 1778513fa5
commit 9eb5f170a2
1 changed files with 32 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
lib/CodeGen/SjLjEHPrepare.cpp
View File

@ -21,7 +21,6 @@
#include "llvm/LLVMContext.h" #include "llvm/LLVMContext.h"
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "llvm/Analysis/Verifier.h"
#include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/Passes.h"
#include "llvm/Target/TargetData.h" #include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetLowering.h" #include "llvm/Target/TargetLowering.h"
@ -140,19 +139,14 @@ void SjLjEHPass::insertCallSiteStore(Instruction *I, int Number) {
Builder.CreateStore(CallSiteNoC, CallSite, true/*volatile*/); Builder.CreateStore(CallSiteNoC, CallSite, true/*volatile*/);
} }
/// markBlocksLiveIn - Insert BB and all of its predescessors into LiveBBs until /// MarkBlocksLiveIn - Insert BB and all of its predescessors into LiveBBs until
/// we reach blocks we've already seen. /// we reach blocks we've already seen.
static void markBlocksLiveIn(BasicBlock *BB, Instruction *Inst, static void MarkBlocksLiveIn(BasicBlock *BB,
SmallPtrSet<BasicBlock*, 64> &LiveBBs, SmallPtrSet<BasicBlock*, 64> &LiveBBs) {
SmallPtrSet<BasicBlock*, 4> &InvokesCrossed) {
if (!LiveBBs.insert(BB)) return; // already been here. if (!LiveBBs.insert(BB)) return; // already been here.
for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI) { for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI)
BasicBlock *Pred = *PI; MarkBlocksLiveIn(*PI, LiveBBs);
if (BB->isLandingPad() && BB != Inst->getParent())
InvokesCrossed.insert(Pred);
markBlocksLiveIn(Pred, Inst, LiveBBs, InvokesCrossed);
}
} }
/// substituteLPadValues - Substitute the values returned by the landingpad /// substituteLPadValues - Substitute the values returned by the landingpad
@ -303,9 +297,6 @@ void SjLjEHPass::lowerIncomingArguments(Function &F) {
/// edge and spill them. /// edge and spill them.
void SjLjEHPass::lowerAcrossUnwindEdges(Function &F, void SjLjEHPass::lowerAcrossUnwindEdges(Function &F,
ArrayRef<InvokeInst*> Invokes) { ArrayRef<InvokeInst*> Invokes) {
SmallVector<std::pair<Instruction*, Instruction*>, 32> ReloadUsers;
DenseMap<std::pair<Instruction*, Instruction*>, AllocaInst*> AllocaMap;
// Finally, scan the code looking for instructions with bad live ranges. // Finally, scan the code looking for instructions with bad live ranges.
for (Function::iterator for (Function::iterator
BB = F.begin(), BBE = F.end(); BB != BBE; ++BB) { BB = F.begin(), BBE = F.end(); BB != BBE; ++BB) {
@ -336,81 +327,44 @@ void SjLjEHPass::lowerAcrossUnwindEdges(Function &F,
} }
// Find all of the blocks that this value is live in. // Find all of the blocks that this value is live in.
std::map<Instruction*, SmallPtrSet<BasicBlock*, 4> > InvokesCrossed; SmallPtrSet<BasicBlock*, 64> LiveBBs;
std::map<Instruction*, SmallPtrSet<BasicBlock*, 64> > LiveBBs; LiveBBs.insert(Inst->getParent());
while (!Users.empty()) { while (!Users.empty()) {
Instruction *U = Users.pop_back_val(); Instruction *U = Users.back();
LiveBBs[U].insert(Inst->getParent()); Users.pop_back();
if (PHINode *PN = dyn_cast<PHINode>(U)) { if (!isa<PHINode>(U)) {
MarkBlocksLiveIn(U->getParent(), LiveBBs);
} else {
// Uses for a PHI node occur in their predecessor block. // Uses for a PHI node occur in their predecessor block.
PHINode *PN = cast<PHINode>(U);
for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i)
if (PN->getIncomingValue(i) == Inst) if (PN->getIncomingValue(i) == Inst)
markBlocksLiveIn(PN->getIncomingBlock(i), Inst, LiveBBs[U], MarkBlocksLiveIn(PN->getIncomingBlock(i), LiveBBs);
InvokesCrossed[U]);
} else {
markBlocksLiveIn(U->getParent(), Inst, LiveBBs[U], InvokesCrossed[U]);
} }
} }
// Go through the invokes the value crosses and insert a spill right // Now that we know all of the blocks that this thing is live in, see if
// before the invoke. // it includes any of the unwind locations.
for (std::map<Instruction*, SmallPtrSet<BasicBlock*, 4> >::iterator bool NeedsSpill = false;
MI = InvokesCrossed.begin(), ME = InvokesCrossed.end(); for (unsigned i = 0, e = Invokes.size(); i != e; ++i) {
MI != ME; ++MI) { BasicBlock *UnwindBlock = Invokes[i]->getUnwindDest();
Instruction *User = MI->first; if (UnwindBlock != BB && LiveBBs.count(UnwindBlock)) {
SmallPtrSet<BasicBlock*, 4> &Crossings = MI->second; DEBUG(dbgs() << "SJLJ Spill: " << *Inst << " around "
if (Crossings.empty()) continue; << UnwindBlock->getName() << "\n");
NeedsSpill = true;
ReloadUsers.push_back(std::make_pair(Inst, User)); break;
AllocaInst *&Slot = AllocaMap[std::make_pair(Inst, User)];
if (!Slot)
Slot = new AllocaInst(Inst->getType(), 0,
Inst->getName() + ".reg2mem",
F.getEntryBlock().begin());
for (SmallPtrSet<BasicBlock*, 4>::iterator
CI = Crossings.begin(), CE = Crossings.end(); CI != CE; ++CI) {
new StoreInst(Inst, Slot, (*CI)->getTerminator());
++NumSpilled;
} }
} }
}
}
// Now go through the instructions which were spilled and replace their uses // If we decided we need a spill, do it.
// after a crossed invoke with a reload instruction. // FIXME: Spilling this way is overkill, as it forces all uses of
for (SmallVectorImpl<std::pair<Instruction*, Instruction*> >::iterator // the value to be reloaded from the stack slot, even those that aren't
I = ReloadUsers.begin(), E = ReloadUsers.end(); I != E; ++I) { // in the unwind blocks. We should be more selective.
Instruction *User = I->second; if (NeedsSpill) {
AllocaInst *Slot = AllocaMap[*I]; DemoteRegToStack(*Inst, true);
assert(Slot && "A spill slot hasn't been allocated yet!"); ++NumSpilled;
}
if (PHINode *PN = dyn_cast<PHINode>(User)) {
// If this is a PHI node, we can't insert a load of the value before the
// use. Instead insert the load in the predecessor block corresponding to
// the incoming value.
//
// Note that if there are multiple edges from a basic block to this PHI
// node that we cannot have multiple loads. The problem is that the
// resulting PHI node will have multiple values (from each load) coming in
// from the same block, which is illegal SSA form. For this reason, we
// keep track of and reuse loads we insert.
DenseMap<BasicBlock*, Value*> Loads;
for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i)
if (PN->getIncomingValue(i) == I->first) {
Value *&V = Loads[PN->getIncomingBlock(i)];
if (V == 0)
// Insert the load into the predecessor block
V = new LoadInst(Slot, I->first->getName() + ".reload", true,
PN->getIncomingBlock(i)->getTerminator());
PN->setIncomingValue(i, V);
}
} else {
LoadInst *Reload = new LoadInst(Slot, Slot->getName() + ".reload", User);
User->replaceUsesOfWith(I->first, Reload);
} }
} }
@ -567,9 +521,5 @@ bool SjLjEHPass::setupEntryBlockAndCallSites(Function &F) {
bool SjLjEHPass::runOnFunction(Function &F) { bool SjLjEHPass::runOnFunction(Function &F) {
bool Res = setupEntryBlockAndCallSites(F); bool Res = setupEntryBlockAndCallSites(F);
DEBUG({
if (verifyFunction(F))
report_fatal_error("verifyFunction failed!");
});
return Res; return Res;
} }