diff options
author | Bill Wendling <isanbard@gmail.com> | 2010-07-15 23:32:40 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2010-07-15 23:32:40 +0000 |
commit | e9bf7e692e56656ef13b33af86624d0fdcd578fb (patch) | |
tree | 2cb585a3c4d0fbf8bb51f00db689241d03af0ad0 | |
parent | 60108e96bbc5432f4fe06ba313e64448e97a0e15 (diff) | |
download | external_llvm-e9bf7e692e56656ef13b33af86624d0fdcd578fb.zip external_llvm-e9bf7e692e56656ef13b33af86624d0fdcd578fb.tar.gz external_llvm-e9bf7e692e56656ef13b33af86624d0fdcd578fb.tar.bz2 |
Handle code gen for the unreachable instruction if it's the only instruction in
the function. We'll just turn it into a "trap" instruction instead.
The problem with not handling this is that it might generate a prologue without
the equivalent epilogue to go with it:
$ cat t.ll
define void @foo() {
entry:
unreachable
}
$ llc -o - t.ll -relocation-model=pic -disable-fp-elim -unwind-tables
.section __TEXT,__text,regular,pure_instructions
.globl _foo
.align 4, 0x90
_foo: ## @foo
Leh_func_begin0:
## BB#0: ## %entry
pushq %rbp
Ltmp0:
movq %rsp, %rbp
Ltmp1:
Leh_func_end0:
...
The unwind tables then have bad data in them causing all sorts of problems.
Fixes <rdar://problem/8096481>.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108473 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 14 | ||||
-rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h | 2 | ||||
-rw-r--r-- | test/CodeGen/PowerPC/2008-01-25-EmptyFunction.ll | 2 | ||||
-rw-r--r-- | test/CodeGen/X86/2008-01-25-EmptyFunction.ll | 13 |
4 files changed, 27 insertions, 4 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 458e865..1fa887c 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -796,6 +796,7 @@ void SelectionDAGBuilder::visit(unsigned Opcode, const User &I) { #define HANDLE_INST(NUM, OPCODE, CLASS) \ case Instruction::OPCODE: visit##OPCODE((CLASS&)I); break; #include "llvm/Instruction.def" +#undef HANDLE_INST } // Assign the ordering to the freshly created DAG nodes. @@ -2194,6 +2195,19 @@ void SelectionDAGBuilder::visitIndirectBr(const IndirectBrInst &I) { getValue(I.getAddress()))); } +void SelectionDAGBuilder::visitUnreachable(const UnreachableInst &I) { + // If the function consists of a single "unreachable" instruction, emit a + // "trap". This prevents the back-ends from generating empty functions or + // functions which have a prologue, but no epilogue. + const BasicBlock *BB = I.getParent(); + const Function *F = BB->getParent(); + + if (F->size() == 1 && BB->size() == 1 && + isa<UnreachableInst>(BB->getTerminator())) + DAG.setRoot(DAG.getNode(ISD::TRAP, getCurDebugLoc(), + MVT::Other, getRoot())); +} + void SelectionDAGBuilder::visitFSub(const User &I) { // -0.0 - X --> fneg const Type *Ty = I.getType(); diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h index 46733d6..8621637 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h @@ -385,7 +385,7 @@ private: void visitBr(const BranchInst &I); void visitSwitch(const SwitchInst &I); void visitIndirectBr(const IndirectBrInst &I); - void visitUnreachable(const UnreachableInst &I) { /* noop */ } + void visitUnreachable(const UnreachableInst &I); // Helpers for visitSwitch bool handleSmallSwitchRange(CaseRec& CR, diff --git a/test/CodeGen/PowerPC/2008-01-25-EmptyFunction.ll b/test/CodeGen/PowerPC/2008-01-25-EmptyFunction.ll index db2ab87..ba59309 100644 --- a/test/CodeGen/PowerPC/2008-01-25-EmptyFunction.ll +++ b/test/CodeGen/PowerPC/2008-01-25-EmptyFunction.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=ppc32 | grep nop +; RUN: llc < %s -march=ppc32 | grep trap target triple = "powerpc-apple-darwin8" diff --git a/test/CodeGen/X86/2008-01-25-EmptyFunction.ll b/test/CodeGen/X86/2008-01-25-EmptyFunction.ll index b936686..4baa294 100644 --- a/test/CodeGen/X86/2008-01-25-EmptyFunction.ll +++ b/test/CodeGen/X86/2008-01-25-EmptyFunction.ll @@ -1,8 +1,17 @@ -; RUN: llc < %s -march=x86 | grep nop +; RUN: llc < %s -march=x86 | FileCheck -check-prefix=NO-FP %s +; RUN: llc < %s -march=x86 -disable-fp-elim | FileCheck -check-prefix=FP %s target triple = "i686-apple-darwin8" +define void @func1() noreturn nounwind { +entry: +; NO-FP: ud2 + unreachable +} -define void @bork() noreturn nounwind { +define void @func2() noreturn nounwind { entry: +; FP: pushl %ebp +; FP: movl %esp, %ebp +; FP: ud2 unreachable } |