diff options
| -rw-r--r-- | lib/VMCore/Instructions.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp index 52d8735d89..3070241ab5 100644 --- a/lib/VMCore/Instructions.cpp +++ b/lib/VMCore/Instructions.cpp @@ -524,6 +524,7 @@ static Instruction *createMalloc(Instruction *InsertBefore, } } MCall->setTailCall(); + MCall->setCallingConv(MallocF->getCallingConv()); assert(MCall->getType() != Type::getVoidTy(BB->getContext()) && "Malloc has void return type"); @@ -572,8 +573,8 @@ static Instruction* createFree(Value* Source, Instruction *InsertBefore, const Type *VoidTy = Type::getVoidTy(M->getContext()); const Type *IntPtrTy = Type::getInt8PtrTy(M->getContext()); // prototype free as "void free(void*)" - Constant *FreeFunc = M->getOrInsertFunction("free", VoidTy, IntPtrTy, NULL); - + Function *FreeFunc = cast<Function>(M->getOrInsertFunction("free", VoidTy, + IntPtrTy, NULL)); CallInst* Result = NULL; Value *PtrCast = Source; if (InsertBefore) { @@ -586,6 +587,7 @@ static Instruction* createFree(Value* Source, Instruction *InsertBefore, Result = CallInst::Create(FreeFunc, PtrCast, ""); } Result->setTailCall(); + Result->setCallingConv(FreeFunc->getCallingConv()); return Result; } |