diff --git a/lib/CodeGen/SjLjEHPrepare.cpp b/lib/CodeGen/SjLjEHPrepare.cpp index 9a86f32d8f9..5ac0c09ded9 100644 --- a/lib/CodeGen/SjLjEHPrepare.cpp +++ b/lib/CodeGen/SjLjEHPrepare.cpp @@ -21,6 +21,7 @@ #include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/Pass.h" +#include "llvm/Analysis/Verifier.h" #include "llvm/CodeGen/Passes.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetLowering.h" @@ -44,6 +45,7 @@ STATISTIC(NumSpilled, "Number of registers live across unwind edges"); namespace { class SjLjEHPrepare : public FunctionPass { const TargetLowering *TLI; + Type *FunctionContextTy; Constant *RegisterFn; Constant *UnregisterFn; @@ -59,11 +61,13 @@ namespace { public: static char ID; // Pass identification, replacement for typeid explicit SjLjEHPrepare(const TargetLowering *tli = NULL) - : FunctionPass(ID), TLI(tli) { } + : FunctionPass(ID), TLI(tli) {} bool doInitialization(Module &M); bool runOnFunction(Function &F); - virtual void getAnalysisUsage(AnalysisUsage &AU) const {} + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + FunctionPass::getAnalysisUsage(AU); + } const char *getPassName() const { return "SJLJ Exception Handling preparation"; } @@ -139,14 +143,26 @@ void SjLjEHPrepare::insertCallSiteStore(Instruction *I, int Number) { 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. -static void MarkBlocksLiveIn(BasicBlock *BB, - SmallPtrSet &LiveBBs) { - if (!LiveBBs.insert(BB)) return; // already been here. +static void markBlocksLiveIn(BasicBlock *BB, Instruction *Inst, + SmallPtrSet &LiveBBs, + SmallPtrSet &InvokesCrossed, + bool &FoundDef) { + if (!LiveBBs.insert(BB)) return; // Already been here. + if (BB == Inst->getParent()) { + FoundDef = true; + return; + } - for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI) - MarkBlocksLiveIn(*PI, LiveBBs); + for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI) { + BasicBlock *Pred = *PI; + if (BB->isLandingPad() && BB != Inst->getParent()) { + InvokesCrossed.insert(Pred); + continue; + } + markBlocksLiveIn(Pred, Inst, LiveBBs, InvokesCrossed, FoundDef); + } } /// substituteLPadValues - Substitute the values returned by the landingpad @@ -297,6 +313,9 @@ void SjLjEHPrepare::lowerIncomingArguments(Function &F) { /// edge and spill them. void SjLjEHPrepare::lowerAcrossUnwindEdges(Function &F, ArrayRef Invokes) { + SmallVector, 32> ReloadUsers; + DenseMap, AllocaInst*> AllocaMap; + // Finally, scan the code looking for instructions with bad live ranges. for (Function::iterator BB = F.begin(), BBE = F.end(); BB != BBE; ++BB) { @@ -327,47 +346,118 @@ void SjLjEHPrepare::lowerAcrossUnwindEdges(Function &F, } // Find all of the blocks that this value is live in. - SmallPtrSet LiveBBs; - LiveBBs.insert(Inst->getParent()); + std::map > InvokesCrossed; + std::map > LiveBBs; + bool FoundDef = false; while (!Users.empty()) { - Instruction *U = Users.back(); - Users.pop_back(); + Instruction *U = Users.pop_back_val(); - if (!isa(U)) { - MarkBlocksLiveIn(U->getParent(), LiveBBs); - } else { + if (PHINode *PN = dyn_cast(U)) { // Uses for a PHI node occur in their predecessor block. - PHINode *PN = cast(U); for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) if (PN->getIncomingValue(i) == Inst) - MarkBlocksLiveIn(PN->getIncomingBlock(i), LiveBBs); + markBlocksLiveIn(PN->getIncomingBlock(i), Inst, LiveBBs[U], + InvokesCrossed[U], FoundDef); + } else { + markBlocksLiveIn(U->getParent(), Inst, LiveBBs[U], + InvokesCrossed[U], FoundDef); } } - // Now that we know all of the blocks that this thing is live in, see if - // it includes any of the unwind locations. - bool NeedsSpill = false; - for (unsigned i = 0, e = Invokes.size(); i != e; ++i) { - BasicBlock *UnwindBlock = Invokes[i]->getUnwindDest(); - if (UnwindBlock != BB && LiveBBs.count(UnwindBlock)) { - DEBUG(dbgs() << "SJLJ Spill: " << *Inst << " around " - << UnwindBlock->getName() << "\n"); - NeedsSpill = true; - break; + // If we hit the definition, resort to the dump-this-value-everywhere + // method. + if (FoundDef) { + // Now that we know all of the blocks that this thing is live in, see if + // it includes any of the unwind locations. + bool NeedsSpill = false; + for (unsigned i = 0, e = Invokes.size(); i != e; ++i) { + BasicBlock *UnwindBlock = Invokes[i]->getUnwindDest(); + if (UnwindBlock == BB) continue; + + for (std::map >::iterator + MI = LiveBBs.begin(), ME = LiveBBs.end(); MI != ME; ++MI) { + if (MI->second.count(UnwindBlock)) { + DEBUG({ + dbgs() << "SJLJ Spill: " << *Inst << " around " + << UnwindBlock->getName() << "\n"; + }); + NeedsSpill = true; + break; + } + } + + // If we decided we need a spill, do it. + if (NeedsSpill) { + DemoteRegToStack(*Inst, true); + ++NumSpilled; + } } + + // We don't need this map anymore. + InvokesCrossed.clear(); } - // If we decided we need a spill, do it. - // FIXME: Spilling this way is overkill, as it forces all uses of - // the value to be reloaded from the stack slot, even those that aren't - // in the unwind blocks. We should be more selective. - if (NeedsSpill) { - DemoteRegToStack(*Inst, true); - ++NumSpilled; + // Go through the invokes the value crosses and insert a spill right + // before the invoke. + for (std::map >::iterator + MI = InvokesCrossed.begin(), ME = InvokesCrossed.end(); + MI != ME; ++MI) { + Instruction *User = MI->first; + SmallPtrSet &Crossings = MI->second; + if (Crossings.empty()) continue; + + ReloadUsers.push_back(std::make_pair(Inst, User)); + + AllocaInst *&Slot = AllocaMap[std::make_pair(Inst, User)]; + if (!Slot) + Slot = new AllocaInst(Inst->getType(), 0, + Inst->getName() + ".reg2mem", + F.getEntryBlock().begin()); + + for (SmallPtrSet::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 + // after a crossed invoke with a reload instruction. + for (SmallVectorImpl >::iterator + I = ReloadUsers.begin(), E = ReloadUsers.end(); I != E; ++I) { + Instruction *User = I->second; + AllocaInst *Slot = AllocaMap[*I]; + assert(Slot && "A spill slot hasn't been allocated yet!"); + + if (PHINode *PN = dyn_cast(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 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); + } + } + // Go through the landing pads and remove any PHIs there. for (unsigned i = 0, e = Invokes.size(); i != e; ++i) { BasicBlock *UnwindBlock = Invokes[i]->getUnwindDest(); @@ -521,5 +611,9 @@ bool SjLjEHPrepare::setupEntryBlockAndCallSites(Function &F) { bool SjLjEHPrepare::runOnFunction(Function &F) { bool Res = setupEntryBlockAndCallSites(F); + DEBUG({ + if (verifyFunction(F)) + report_fatal_error("verifyFunction failed!"); + }); return Res; }