diff options
| author | Reid Kleckner <rnk@google.com> | 2015-10-09 01:13:17 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2015-10-09 01:13:17 +0000 |
| commit | ae44e871cdd5c51a17198733e9b795d2eabaef14 (patch) | |
| tree | 06987cd62dd9dcf85520edcf012ec34ddeea4800 /llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | |
| parent | 37bb6810f24a68643aea0268b85e7c1b9f1a3f02 (diff) | |
| download | bcm5719-llvm-ae44e871cdd5c51a17198733e9b795d2eabaef14.tar.gz bcm5719-llvm-ae44e871cdd5c51a17198733e9b795d2eabaef14.zip | |
Revert "Revert "Revert r248959, "[WinEH] Emit int3 after noreturn calls on Win64"""
This reverts commit r249794.
Apparently my checkouts are full of unexpected surprises today.
llvm-svn: 249796
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/FastISel.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp index f97edb4ef09..13b097cfc60 100644 --- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp @@ -1569,8 +1569,10 @@ bool FastISel::selectOperator(const User *I, unsigned Opcode) { } case Instruction::Unreachable: - // Nothing to emit. - return true; + if (TM.Options.TrapUnreachable) + return fastEmit_(MVT::Other, MVT::Other, ISD::TRAP) != 0; + else + return true; case Instruction::Alloca: // FunctionLowering has the static-sized case covered. |
