maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use Intrinsic::getDeclaration to get hold of 

intrinsics.  Fix up the argument type (should
be i8*, was an array*).

llvm-svn: 49336
This commit is contained in:
Duncan Sands 2008-04-07 13:41:19 +00:00
parent a8ff6ca2e3
commit fbc6adcc59
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
llvm/lib/Transforms/Utils/LowerInvoke.cpp
View File

@ -39,6 +39,7 @@
#include "llvm/Constants.h" #include "llvm/Constants.h"
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"
#include "llvm/Instructions.h" #include "llvm/Instructions.h"
#include "llvm/Intrinsics.h"
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h"
@ -142,12 +143,8 @@ bool LowerInvoke::doInitialization(Module &M) {
Constant::getNullValue(PtrJBList), Constant::getNullValue(PtrJBList),
"llvm.sjljeh.jblist", &M); "llvm.sjljeh.jblist", &M);
} }
SetJmpFn = M.getOrInsertFunction("llvm.setjmp", Type::Int32Ty, SetJmpFn = Intrinsic::getDeclaration(&M, Intrinsic::setjmp);
PointerType::getUnqual(JmpBufTy), LongJmpFn = Intrinsic::getDeclaration(&M, Intrinsic::longjmp);
(Type *)0);
LongJmpFn = M.getOrInsertFunction("llvm.longjmp", Type::VoidTy,
PointerType::getUnqual(JmpBufTy),
Type::Int32Ty, (Type *)0);
} }
// We need the 'write' and 'abort' functions for both models. // We need the 'write' and 'abort' functions for both models.
@ -505,9 +502,11 @@ bool LowerInvoke::insertExpensiveEHSupport(Function &F) {
Value *JmpBufPtr = GetElementPtrInst::Create(JmpBuf, Idx.begin(), Idx.end(), Value *JmpBufPtr = GetElementPtrInst::Create(JmpBuf, Idx.begin(), Idx.end(),
"TheJmpBuf", "TheJmpBuf",
EntryBB->getTerminator()); EntryBB->getTerminator());
JmpBufPtr = new BitCastInst(JmpBufPtr, PointerType::getUnqual(Type::Int8Ty),
"tmp", EntryBB->getTerminator());
Value *SJRet = CallInst::Create(SetJmpFn, JmpBufPtr, "sjret", Value *SJRet = CallInst::Create(SetJmpFn, JmpBufPtr, "sjret",
EntryBB->getTerminator()); EntryBB->getTerminator());
// Compare the return value to zero. // Compare the return value to zero.
Value *IsNormal = new ICmpInst(ICmpInst::ICMP_EQ, SJRet, Value *IsNormal = new ICmpInst(ICmpInst::ICMP_EQ, SJRet,
Constant::getNullValue(SJRet->getType()), Constant::getNullValue(SJRet->getType()),
@ -555,6 +554,8 @@ bool LowerInvoke::insertExpensiveEHSupport(Function &F) {
Idx.push_back(ConstantInt::get(Type::Int32Ty, 0)); Idx.push_back(ConstantInt::get(Type::Int32Ty, 0));
Idx[0] = GetElementPtrInst::Create(BufPtr, Idx.begin(), Idx.end(), "JmpBuf", Idx[0] = GetElementPtrInst::Create(BufPtr, Idx.begin(), Idx.end(), "JmpBuf",
UnwindBlock); UnwindBlock);
Idx[0] = new BitCastInst(Idx[0], PointerType::getUnqual(Type::Int8Ty),
"tmp", UnwindBlock);
Idx[1] = ConstantInt::get(Type::Int32Ty, 1); Idx[1] = ConstantInt::get(Type::Int32Ty, 1);
CallInst::Create(LongJmpFn, Idx.begin(), Idx.end(), "", UnwindBlock); CallInst::Create(LongJmpFn, Idx.begin(), Idx.end(), "", UnwindBlock);
new UnreachableInst(UnwindBlock); new UnreachableInst(UnwindBlock);