6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Revert r176154 in favor of a better approach.

Browse Source 
Code generation makes some basic assumptions about the IR it's been given. In
particular, if there is only one 'invoke' in the function, then that invoke
won't be going away. However, with the advent of the `llvm.donothing' intrinsic,
those invokes may go away. If all of them go away, the landing pad no longer has
any users. This confuses the back-end, which asserts.

This happens with SjLj exceptions, because that's the model that modifies the IR
based on there being invokes, etc. in the function.

Remove any invokes of `llvm.donothing' during SjLj EH preparation. This will
give us a CFG that the back-end won't be confused about. If all of the invokes
in a function are removed, then the SjLj EH prepare pass won't insert the bogus
code the relies upon the invokes being there.
<rdar://problem/13228754&13316637>


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@176677 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-03-08 02:21:08 +00:00
parent 4434a4f8bd
commit e36b47e17b
3 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View File

@ -1872,13 +1872,6 @@ void SelectionDAGBuilder::visitInvoke(const InvokeInst &I) {
visitInlineAsm(&I);
else if (Fn && Fn->isIntrinsic()) {
assert(Fn->getIntrinsicID() == Intrinsic::donothing);
// If donothing has a landingpad, we should clear CurrentCallSite.
if (LandingPad) {
MachineModuleInfo &MMI = DAG.getMachineFunction().getMMI();
unsigned CallSiteIndex = MMI.getCurrentCallSite();
if (CallSiteIndex)
MMI.setCurrentCallSite(0);
}
// Ignore invokes to @llvm.donothing: jump directly to the next BB.
} else
LowerCallTo(&I, getValue(Callee), false, LandingPad);

13
lib/CodeGen/SjLjEHPrepare.cpp
View File

@ -379,13 +379,22 @@ void SjLjEHPrepare::lowerAcrossUnwindEdges(Function &F,
/// the function context and marking the call sites with the appropriate
/// values. These values are used by the DWARF EH emitter.
bool SjLjEHPrepare::setupEntryBlockAndCallSites(Function &F) {
SmallVector<ReturnInst*, 16> Returns;
SmallVector<InvokeInst*, 16> Invokes;
SmallVector<ReturnInst*, 16> Returns;
SmallVector<InvokeInst*, 16> Invokes;
SmallSetVector<LandingPadInst*, 16> LPads;
// Look through the terminators of the basic blocks to find invokes.
for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator())) {
if (Function *Callee = II->getCalledFunction())
if (Callee->isIntrinsic() &&
Callee->getIntrinsicID() == Intrinsic::donothing) {
// Remove the NOP invoke.
BranchInst::Create(II->getNormalDest(), II);
II->eraseFromParent();
continue;
}
Invokes.push_back(II);
LPads.insert(II->getUnwindDest()->getLandingPadInst());
} else if (ReturnInst *RI = dyn_cast<ReturnInst>(BB->getTerminator())) {

45
test/CodeGen/ARM/invoke-donothing-assert.ll
View File

@ -1,13 +1,10 @@
; RUN: llc < %s -mtriple=armv7-apple-ios | FileCheck %s
; This testcase makes sure we can handle invoke @llvm.donothing without
; assertion failure.
; rdar://problem/13228754
; CHECK: .globl _main
; <rdar://problem/13228754> & <rdar://problem/13316637>
declare void @callA()
declare i32 @__gxx_personality_sj0(...)
define void @main() {
; CHECK: .globl _foo
define void @foo() {
invoke.cont:
invoke void @callA()
to label %invoke.cont25 unwind label %lpad2
@ -36,5 +33,41 @@ eh.resume:
resume { i8*, i32 } zeroinitializer
}
; CHECK: .globl _bar
define linkonce_odr void @bar(i32* %a) {
if.end.i.i.i:
invoke void @llvm.donothing()
to label %call.i.i.i.noexc unwind label %eh.resume
call.i.i.i.noexc:
br i1 false, label %cleanup, label %new.notnull.i.i
new.notnull.i.i:
br label %cleanup
cleanup:
%0 = load i32* %a, align 4
%inc294 = add nsw i32 %0, 4
store i32 %inc294, i32* %a, align 4
br i1 false, label %_ZN3lol5ArrayIivvvvvvvED1Ev.exit, label %delete.notnull.i.i.i1409
delete.notnull.i.i.i1409:
br label %_ZN3lol5ArrayIivvvvvvvED1Ev.exit
_ZN3lol5ArrayIivvvvvvvED1Ev.exit:
ret void
eh.resume:
%1 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_sj0 to i8*)
cleanup
%2 = extractvalue { i8*, i32 } %1, 0
%3 = extractvalue { i8*, i32 } %1, 1
%lpad.val = insertvalue { i8*, i32 } undef, i8* %2, 0
%lpad.val395 = insertvalue { i8*, i32 } %lpad.val, i32 %3, 1
resume { i8*, i32 } %lpad.val395
}
declare void @callA()
declare void @callB()
declare void @llvm.donothing() nounwind readnone
declare i32 @__gxx_personality_sj0(...)