summaryrefslogtreecommitdiff
path: root/lib/CodeGen/LLVMTargetMachine.cpp
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2012-11-30 22:08:55 +0000
committerBill Wendling <isanbard@gmail.com>2012-11-30 22:08:55 +0000
commit08510b14d4fe5d9b1a979fbee8a7aad11dbc6cea (patch)
treebffe39f76d8df42d0557b40e7c80bc2d3359fa47 /lib/CodeGen/LLVMTargetMachine.cpp
parentc2a08d28eb1199d67dff5b66061cf7f6a25d2527 (diff)
downloadllvm-08510b14d4fe5d9b1a979fbee8a7aad11dbc6cea.tar.gz
llvm-08510b14d4fe5d9b1a979fbee8a7aad11dbc6cea.tar.bz2
llvm-08510b14d4fe5d9b1a979fbee8a7aad11dbc6cea.tar.xz
Replace r168930 with a more reasonable patch.
The original patch removed a bunch of code that the SjLjEHPrepare pass placed into the entry block if all of the landing pads were removed during the CodeGenPrepare class. The more natural way of doing things is to run the CGP *before* we run the SjLjEHPrepare pass. Make it so! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169044 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/LLVMTargetMachine.cpp')
-rw-r--r--lib/CodeGen/LLVMTargetMachine.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp
index 91ec038725..db2a54fcad 100644
--- a/lib/CodeGen/LLVMTargetMachine.cpp
+++ b/lib/CodeGen/LLVMTargetMachine.cpp
@@ -96,6 +96,8 @@ static MCContext *addPassesToGenerateCode(LLVMTargetMachine *TM,
PassConfig->addIRPasses();
+ PassConfig->addCodeGenPrepare();
+
PassConfig->addPassesToHandleExceptions();
PassConfig->addISelPrepare();