From: Bill Wendling <isanbard@gmail.com>
Date: Mon, 3 Oct 2011 22:42:40 +0000 (+0000)
Subject: Don't carry over the dispatchsetup hack from the old system.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f8520d564c095e3ee278090b605c4b827604c817;p=oota-llvm.git

Don't carry over the dispatchsetup hack from the old system.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141040 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/SjLjEHPrepare.cpp b/lib/CodeGen/SjLjEHPrepare.cpp
index 127ebcf6606..76b327a8eb2 100644
--- a/lib/CodeGen/SjLjEHPrepare.cpp
+++ b/lib/CodeGen/SjLjEHPrepare.cpp
@@ -849,13 +849,7 @@ bool SjLjEHPass::setupEntryBlockAndCallSites(Function &F) {
     CastInst::Create(Instruction::BitCast, JBufPtr,
                      Type::getInt8PtrTy(F.getContext()), "",
                      EntryBB->getTerminator());
-  Value *DispatchVal = CallInst::Create(BuiltinSetjmpFn, SetjmpArg,
-                                        "dispatch",
-                                        EntryBB->getTerminator());
-
-  // Add a call to dispatch_setup after the setjmp call. This is expanded to any
-  // target-specific setup that needs to be done.
-  CallInst::Create(DispatchSetupFn, DispatchVal, "", EntryBB->getTerminator());
+  CallInst::Create(BuiltinSetjmpFn, SetjmpArg, "", EntryBB->getTerminator());
 
   // Store a pointer to the function context so that the back-end will know
   // where to look for it.