6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-27 12:26:08 +00:00
Code Issues Projects Releases Wiki Activity

For SJLJ exception handling, make sure that all calls that are not marked

Browse Source 
as nounwind are marked with a -1 call-site value. This is necessary to, for
example, correctly process exceptions thrown from within an "unexpected"
execption handler (see SingleSource/Regression/C++/EH/expection_spec_test.cpp).



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97757 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach
2010-03-04 22:07:46 +00:00
parent 436e6e7b5c
commit b58a59b3c1
1 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lib/CodeGen/SjLjEHPrepare.cpp
View File

@@ -44,7 +44,6 @@ namespace {
const Type *FunctionContextTy; const Type *FunctionContextTy;
Constant *RegisterFn; Constant *RegisterFn;
Constant *UnregisterFn; Constant *UnregisterFn;
Constant *ResumeFn;
Constant *BuiltinSetjmpFn; Constant *BuiltinSetjmpFn;
Constant *FrameAddrFn; Constant *FrameAddrFn;
Constant *LSDAAddrFn; Constant *LSDAAddrFn;
@@ -67,8 +66,8 @@ namespace {
} }
private: private:
void markInvokeCallSite(InvokeInst *II, unsigned InvokeNo, void insertCallSiteStore(Instruction *I, int Number, Value *CallSite);
Value *CallSite, void markInvokeCallSite(InvokeInst *II, int InvokeNo, Value *CallSite,
SwitchInst *CatchSwitch); SwitchInst *CatchSwitch);
void splitLiveRangesLiveAcrossInvokes(SmallVector<InvokeInst*,16> &Invokes); void splitLiveRangesLiveAcrossInvokes(SmallVector<InvokeInst*,16> &Invokes);
bool insertSjLjEHSupport(Function &F); bool insertSjLjEHSupport(Function &F);
@@ -107,11 +106,6 @@ bool SjLjEHPass::doInitialization(Module &M) {
Type::getVoidTy(M.getContext()), Type::getVoidTy(M.getContext()),
PointerType::getUnqual(FunctionContextTy), PointerType::getUnqual(FunctionContextTy),
(Type *)0); (Type *)0);
ResumeFn =
M.getOrInsertFunction("_Unwind_SjLj_Resume",
Type::getVoidTy(M.getContext()),
VoidPtrTy,
(Type *)0);
FrameAddrFn = Intrinsic::getDeclaration(&M, Intrinsic::frameaddress); FrameAddrFn = Intrinsic::getDeclaration(&M, Intrinsic::frameaddress);
BuiltinSetjmpFn = Intrinsic::getDeclaration(&M, Intrinsic::eh_sjlj_setjmp); BuiltinSetjmpFn = Intrinsic::getDeclaration(&M, Intrinsic::eh_sjlj_setjmp);
LSDAAddrFn = Intrinsic::getDeclaration(&M, Intrinsic::eh_sjlj_lsda); LSDAAddrFn = Intrinsic::getDeclaration(&M, Intrinsic::eh_sjlj_lsda);
@@ -123,8 +117,18 @@ bool SjLjEHPass::doInitialization(Module &M) {
return true; return true;
} }
/// insertCallSiteStore - Insert a store of the call-site value to the
/// function context
void SjLjEHPass::insertCallSiteStore(Instruction *I, int Number,
Value *CallSite) {
ConstantInt *CallSiteNoC = ConstantInt::get(Type::getInt32Ty(I->getContext()),
Number);
// Insert a store of the call-site number
new StoreInst(CallSiteNoC, CallSite, true, I); // volatile
}
/// markInvokeCallSite - Insert code to mark the call_site for this invoke /// markInvokeCallSite - Insert code to mark the call_site for this invoke
void SjLjEHPass::markInvokeCallSite(InvokeInst *II, unsigned InvokeNo, void SjLjEHPass::markInvokeCallSite(InvokeInst *II, int InvokeNo,
Value *CallSite, Value *CallSite,
SwitchInst *CatchSwitch) { SwitchInst *CatchSwitch) {
ConstantInt *CallSiteNoC= ConstantInt::get(Type::getInt32Ty(II->getContext()), ConstantInt *CallSiteNoC= ConstantInt::get(Type::getInt32Ty(II->getContext()),
@@ -145,8 +149,11 @@ void SjLjEHPass::markInvokeCallSite(InvokeInst *II, unsigned InvokeNo,
} }
} }
// Insert a store of the invoke num before the invoke // Insert the store of the call site value
new StoreInst(CallSiteNoC, CallSite, true, II); // volatile insertCallSiteStore(II, InvokeNo, CallSite);
// Record the call site value for the back end so it stays associated with
// the invoke.
CallInst::Create(CallSiteFn, CallSiteNoC, "", II); CallInst::Create(CallSiteFn, CallSiteNoC, "", II);
// Add a switch case to our unwind block. // Add a switch case to our unwind block.
@@ -272,8 +279,8 @@ bool SjLjEHPass::insertSjLjEHSupport(Function &F) {
SmallVector<InvokeInst*,16> Invokes; SmallVector<InvokeInst*,16> Invokes;
// Look through the terminators of the basic blocks to find invokes, returns // Look through the terminators of the basic blocks to find invokes, returns
// and unwinds // and unwinds.
for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) {
if (ReturnInst *RI = dyn_cast<ReturnInst>(BB->getTerminator())) { if (ReturnInst *RI = dyn_cast<ReturnInst>(BB->getTerminator())) {
// Remember all return instructions in case we insert an invoke into this // Remember all return instructions in case we insert an invoke into this
// function. // function.
@@ -283,6 +290,7 @@ bool SjLjEHPass::insertSjLjEHSupport(Function &F) {
} else if (UnwindInst *UI = dyn_cast<UnwindInst>(BB->getTerminator())) { } else if (UnwindInst *UI = dyn_cast<UnwindInst>(BB->getTerminator())) {
Unwinds.push_back(UI); Unwinds.push_back(UI);
} }
}
// If we don't have any invokes or unwinds, there's nothing to do. // If we don't have any invokes or unwinds, there's nothing to do.
if (Unwinds.empty() && Invokes.empty()) return false; if (Unwinds.empty() && Invokes.empty()) return false;
@@ -478,22 +486,19 @@ bool SjLjEHPass::insertSjLjEHSupport(Function &F) {
for (unsigned i = 0, e = Invokes.size(); i != e; ++i) for (unsigned i = 0, e = Invokes.size(); i != e; ++i)
markInvokeCallSite(Invokes[i], i+1, CallSite, DispatchSwitch); markInvokeCallSite(Invokes[i], i+1, CallSite, DispatchSwitch);
// The front end has likely added calls to _Unwind_Resume. We need // Mark call instructions that aren't nounwind as no-action
// to find those calls and mark the call_site as -1 immediately prior. // (call_site == -1). Skip the entry block, as prior to then, no function
// resume is a noreturn function, so any block that has a call to it // context has been created for this function and any unexpected exceptions
// should end in an 'unreachable' instruction with the call immediately // thrown will go directly to the caller's context, which is what we want
// prior. That's how we'll search. // anyway, so no need to do anything here.
// ??? There's got to be a better way. this is fugly. for (Function::iterator BB = F.begin(), E = F.end(); ++BB != E;) {
for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) for (BasicBlock::iterator I = BB->begin(), end = BB->end(); I != end; ++I)
if ((dyn_cast<UnreachableInst>(BB->getTerminator()))) { if (CallInst *CI = dyn_cast<CallInst>(I)) {
BasicBlock::iterator I = BB->getTerminator(); // Ignore calls to the EH builtins (eh.selector, eh.exception)
// Check the previous instruction and see if it's a resume call Constant *Callee = CI->getCalledFunction();
if (I == BB->begin()) continue; if (Callee != SelectorFn && Callee != ExceptionFn
if (CallInst *CI = dyn_cast<CallInst>(--I)) { && !CI->doesNotThrow())
if (CI->getCalledFunction() == ResumeFn) { insertCallSiteStore(CI, -1, CallSite);
Value *NegativeOne = Constant::getAllOnesValue(Int32Ty);
new StoreInst(NegativeOne, CallSite, true, I); // volatile
}
} }
} }