projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up -fstack-protector on linux to use the segment
[oota-llvm.git]
/
lib
/
CodeGen
/
IntrinsicLowering.cpp
diff --git
a/lib/CodeGen/IntrinsicLowering.cpp
b/lib/CodeGen/IntrinsicLowering.cpp
index 87ab7ef52e54108d8f16b237512234ffd0eaa177..03ae214ae7dab64fab3869962a566af280ab0df3 100644
(file)
--- a/
lib/CodeGen/IntrinsicLowering.cpp
+++ b/
lib/CodeGen/IntrinsicLowering.cpp
@@
-16,6
+16,7
@@
#include "llvm/Module.h"
#include "llvm/Type.h"
#include "llvm/CodeGen/IntrinsicLowering.h"
#include "llvm/Module.h"
#include "llvm/Type.h"
#include "llvm/CodeGen/IntrinsicLowering.h"
+#include "llvm/Support/CallSite.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/IRBuilder.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/IRBuilder.h"
#include "llvm/Support/raw_ostream.h"
@@
-83,6
+84,12
@@
static CallInst *ReplaceCallWith(const char *NewFn, CallInst *CI,
return NewCI;
}
return NewCI;
}
+// VisualStudio defines setjmp as _setjmp
+#if defined(_MSC_VER) && defined(setjmp)
+#define setjmp_undefined_for_visual_studio
+#undef setjmp
+#endif
+
void IntrinsicLowering::AddPrototypes(Module &M) {
LLVMContext &Context = M.getContext();
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
void IntrinsicLowering::AddPrototypes(Module &M) {
LLVMContext &Context = M.getContext();
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
@@
-308,21
+315,22
@@
static Value *LowerCTLZ(LLVMContext &Context, Value *V, Instruction *IP) {
static void ReplaceFPIntrinsicWithCall(CallInst *CI, const char *Fname,
const char *Dname,
const char *LDname) {
static void ReplaceFPIntrinsicWithCall(CallInst *CI, const char *Fname,
const char *Dname,
const char *LDname) {
- switch (CI->getOperand(1)->getType()->getTypeID()) {
+ CallSite CS(CI);
+ switch (CI->getArgOperand(0)->getType()->getTypeID()) {
default: llvm_unreachable("Invalid type in intrinsic");
case Type::FloatTyID:
default: llvm_unreachable("Invalid type in intrinsic");
case Type::FloatTyID:
- ReplaceCallWith(Fname, CI, C
I->op_begin() + 1, CI->op
_end(),
+ ReplaceCallWith(Fname, CI, C
S.arg_begin(), CS.arg
_end(),
Type::getFloatTy(CI->getContext()));
break;
case Type::DoubleTyID:
Type::getFloatTy(CI->getContext()));
break;
case Type::DoubleTyID:
- ReplaceCallWith(Dname, CI, C
I->op_begin() + 1, CI->op
_end(),
+ ReplaceCallWith(Dname, CI, C
S.arg_begin(), CS.arg
_end(),
Type::getDoubleTy(CI->getContext()));
break;
case Type::X86_FP80TyID:
case Type::FP128TyID:
case Type::PPC_FP128TyID:
Type::getDoubleTy(CI->getContext()));
break;
case Type::X86_FP80TyID:
case Type::FP128TyID:
case Type::PPC_FP128TyID:
- ReplaceCallWith(LDname, CI, C
I->op_begin() + 1, CI->op
_end(),
- CI->get
Operand(1
)->getType());
+ ReplaceCallWith(LDname, CI, C
S.arg_begin(), CS.arg
_end(),
+ CI->get
ArgOperand(0
)->getType());
break;
}
}
break;
}
}
@@
-331,15
+339,16
@@
void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
IRBuilder<> Builder(CI->getParent(), CI);
LLVMContext &Context = CI->getContext();
IRBuilder<> Builder(CI->getParent(), CI);
LLVMContext &Context = CI->getContext();
- Function *Callee = CI->getCalledFunction();
+
const
Function *Callee = CI->getCalledFunction();
assert(Callee && "Cannot lower an indirect call!");
assert(Callee && "Cannot lower an indirect call!");
+ CallSite CS(CI);
switch (Callee->getIntrinsicID()) {
case Intrinsic::not_intrinsic:
switch (Callee->getIntrinsicID()) {
case Intrinsic::not_intrinsic:
-
llvm_report
_error("Cannot lower a call to a non-intrinsic function '"+
+
report_fatal
_error("Cannot lower a call to a non-intrinsic function '"+
Callee->getName() + "'!");
default:
Callee->getName() + "'!");
default:
-
llvm_report
_error("Code generator does not support intrinsic function '"+
+
report_fatal
_error("Code generator does not support intrinsic function '"+
Callee->getName()+"'!");
// The setjmp/longjmp intrinsics should only exist in the code if it was
Callee->getName()+"'!");
// The setjmp/longjmp intrinsics should only exist in the code if it was
@@
-347,7
+356,7
@@
void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
// by the lowerinvoke pass. In both cases, the right thing to do is to
// convert the call to an explicit setjmp or longjmp call.
case Intrinsic::setjmp: {
// by the lowerinvoke pass. In both cases, the right thing to do is to
// convert the call to an explicit setjmp or longjmp call.
case Intrinsic::setjmp: {
- Value *V = ReplaceCallWith("setjmp", CI, C
I->op_begin() + 1, CI->op
_end(),
+ Value *V = ReplaceCallWith("setjmp", CI, C
S.arg_begin(), CS.arg
_end(),
Type::getInt32Ty(Context));
if (!CI->getType()->isVoidTy())
CI->replaceAllUsesWith(V);
Type::getInt32Ty(Context));
if (!CI->getType()->isVoidTy())
CI->replaceAllUsesWith(V);
@@
-359,32
+368,32
@@
void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
break;
case Intrinsic::longjmp: {
break;
case Intrinsic::longjmp: {
- ReplaceCallWith("longjmp", CI, C
I->op_begin() + 1, CI->op
_end(),
+ ReplaceCallWith("longjmp", CI, C
S.arg_begin(), CS.arg
_end(),
Type::getVoidTy(Context));
break;
}
case Intrinsic::siglongjmp: {
// Insert the call to abort
Type::getVoidTy(Context));
break;
}
case Intrinsic::siglongjmp: {
// Insert the call to abort
- ReplaceCallWith("abort", CI, C
I->op_end(), CI->op
_end(),
+ ReplaceCallWith("abort", CI, C
S.arg_end(), CS.arg
_end(),
Type::getVoidTy(Context));
break;
}
case Intrinsic::ctpop:
Type::getVoidTy(Context));
break;
}
case Intrinsic::ctpop:
- CI->replaceAllUsesWith(LowerCTPOP(Context, CI->get
Operand(1
), CI));
+ CI->replaceAllUsesWith(LowerCTPOP(Context, CI->get
ArgOperand(0
), CI));
break;
case Intrinsic::bswap:
break;
case Intrinsic::bswap:
- CI->replaceAllUsesWith(LowerBSWAP(Context, CI->get
Operand(1
), CI));
+ CI->replaceAllUsesWith(LowerBSWAP(Context, CI->get
ArgOperand(0
), CI));
break;
case Intrinsic::ctlz:
break;
case Intrinsic::ctlz:
- CI->replaceAllUsesWith(LowerCTLZ(Context, CI->get
Operand(1
), CI));
+ CI->replaceAllUsesWith(LowerCTLZ(Context, CI->get
ArgOperand(0
), CI));
break;
case Intrinsic::cttz: {
// cttz(x) -> ctpop(~X & (X-1))
break;
case Intrinsic::cttz: {
// cttz(x) -> ctpop(~X & (X-1))
- Value *Src = CI->get
Operand(1
);
+ Value *Src = CI->get
ArgOperand(0
);
Value *NotSrc = Builder.CreateNot(Src);
NotSrc->setName(Src->getName() + ".not");
Value *SrcM1 = ConstantInt::get(Src->getType(), 1);
Value *NotSrc = Builder.CreateNot(Src);
NotSrc->setName(Src->getName() + ".not");
Value *SrcM1 = ConstantInt::get(Src->getType(), 1);
@@
-445,37
+454,37
@@
void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
case Intrinsic::memcpy: {
const IntegerType *IntPtr = TD.getIntPtrType(Context);
case Intrinsic::memcpy: {
const IntegerType *IntPtr = TD.getIntPtrType(Context);
- Value *Size = Builder.CreateIntCast(CI->get
Operand(3
), IntPtr,
+ Value *Size = Builder.CreateIntCast(CI->get
ArgOperand(2
), IntPtr,
/* isSigned */ false);
Value *Ops[3];
/* isSigned */ false);
Value *Ops[3];
- Ops[0] = CI->get
Operand(1
);
- Ops[1] = CI->get
Operand(2
);
+ Ops[0] = CI->get
ArgOperand(0
);
+ Ops[1] = CI->get
ArgOperand(1
);
Ops[2] = Size;
Ops[2] = Size;
- ReplaceCallWith("memcpy", CI, Ops, Ops+3, CI->get
Operand(1
)->getType());
+ ReplaceCallWith("memcpy", CI, Ops, Ops+3, CI->get
ArgOperand(0
)->getType());
break;
}
case Intrinsic::memmove: {
const IntegerType *IntPtr = TD.getIntPtrType(Context);
break;
}
case Intrinsic::memmove: {
const IntegerType *IntPtr = TD.getIntPtrType(Context);
- Value *Size = Builder.CreateIntCast(CI->get
Operand(3
), IntPtr,
+ Value *Size = Builder.CreateIntCast(CI->get
ArgOperand(2
), IntPtr,
/* isSigned */ false);
Value *Ops[3];
/* isSigned */ false);
Value *Ops[3];
- Ops[0] = CI->get
Operand(1
);
- Ops[1] = CI->get
Operand(2
);
+ Ops[0] = CI->get
ArgOperand(0
);
+ Ops[1] = CI->get
ArgOperand(1
);
Ops[2] = Size;
Ops[2] = Size;
- ReplaceCallWith("memmove", CI, Ops, Ops+3, CI->get
Operand(1
)->getType());
+ ReplaceCallWith("memmove", CI, Ops, Ops+3, CI->get
ArgOperand(0
)->getType());
break;
}
case Intrinsic::memset: {
const IntegerType *IntPtr = TD.getIntPtrType(Context);
break;
}
case Intrinsic::memset: {
const IntegerType *IntPtr = TD.getIntPtrType(Context);
- Value *Size = Builder.CreateIntCast(CI->get
Operand(3
), IntPtr,
+ Value *Size = Builder.CreateIntCast(CI->get
ArgOperand(2
), IntPtr,
/* isSigned */ false);
Value *Ops[3];
/* isSigned */ false);
Value *Ops[3];
- Ops[0] = CI->get
Operand(1
);
+ Ops[0] = CI->get
ArgOperand(0
);
// Extend the amount to i32.
// Extend the amount to i32.
- Ops[1] = Builder.CreateIntCast(CI->get
Operand(2
), Type::getInt32Ty(Context),
+ Ops[1] = Builder.CreateIntCast(CI->get
ArgOperand(1
), Type::getInt32Ty(Context),
/* isSigned */ false);
Ops[2] = Size;
/* isSigned */ false);
Ops[2] = Size;
- ReplaceCallWith("memset", CI, Ops, Ops+3, CI->get
Operand(1
)->getType());
+ ReplaceCallWith("memset", CI, Ops, Ops+3, CI->get
ArgOperand(0
)->getType());
break;
}
case Intrinsic::sqrt: {
break;
}
case Intrinsic::sqrt: {