Changes in directory llvm/lib/CodeGen:
IntrinsicLowering.cpp updated: 1.60 -> 1.61
---
Log message:
Use TargetData to obtain the correct size of the "size_t" argument for
functions like memcpy, memmove and memset. Ensure only one prototype is
used for these functions and that it matches the system definition by
using the appropriate type for the size argument.
---
Diffs of the changes: (+24 -9)
IntrinsicLowering.cpp | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
Index: llvm/lib/CodeGen/IntrinsicLowering.cpp
diff -u llvm/lib/CodeGen/IntrinsicLowering.cpp:1.60
llvm/lib/CodeGen/IntrinsicLowering.cpp:1.61
--- llvm/lib/CodeGen/IntrinsicLowering.cpp:1.60 Sun Jan 28 16:28:00 2007
+++ llvm/lib/CodeGen/IntrinsicLowering.cpp Mon Jan 29 11:42:06 2007
@@ -18,6 +18,7 @@
#include "llvm/Type.h"
#include "llvm/CodeGen/IntrinsicLowering.h"
#include "llvm/Support/Streams.h"
+#include "llvm/Target/TargetData.h"
using namespace llvm;
template <class ArgIt>
@@ -79,22 +80,21 @@
case Intrinsic::memcpy_i64:
M.getOrInsertFunction("memcpy", PointerType::get(Type::Int8Ty),
PointerType::get(Type::Int8Ty),
- PointerType::get(Type::Int8Ty), Type::Int32Ty,
- (Type *)0);
+ PointerType::get(Type::Int8Ty),
+ TD.getIntPtrType(), (Type *)0);
break;
case Intrinsic::memmove_i32:
case Intrinsic::memmove_i64:
M.getOrInsertFunction("memmove", PointerType::get(Type::Int8Ty),
PointerType::get(Type::Int8Ty),
- PointerType::get(Type::Int8Ty), Type::Int32Ty,
- (Type *)0);
+ PointerType::get(Type::Int8Ty),
+ TD.getIntPtrType(), (Type *)0);
break;
case Intrinsic::memset_i32:
case Intrinsic::memset_i64:
M.getOrInsertFunction("memset", PointerType::get(Type::Int8Ty),
- PointerType::get(Type::Int8Ty),
- Type::Int32Ty, (--(--I->arg_end()))->getType(),
- (Type *)0);
+ PointerType::get(Type::Int8Ty), Type::Int32Ty,
+ TD.getIntPtrType(), (Type *)0);
break;
case Intrinsic::sqrt_f32:
case Intrinsic::sqrt_f64:
@@ -358,6 +358,9 @@
case Intrinsic::memcpy_i32: {
static Constant *MemcpyFCache = 0;
+ Value * Size = cast<Value>(CI->op_end()-1);
+ if (Size->getType() != TD.getIntPtrType())
+ Size->replaceAllUsesWith(new ZExtInst(Size, TD.getIntPtrType()));
ReplaceCallWith("memcpy", CI, CI->op_begin()+1, CI->op_end()-1,
(*(CI->op_begin()+1))->getType(), MemcpyFCache);
break;
@@ -365,31 +368,43 @@
case Intrinsic::memcpy_i64: {
static Constant *MemcpyFCache = 0;
Value * Size = cast<Value>(CI->op_end()-1);
- if (Size->getType() != Type::Int32Ty)
- Size->replaceAllUsesWith(new TruncInst(Size, Type::Int32Ty));
+ if (Size->getType() != TD.getIntPtrType())
+ Size->replaceAllUsesWith(new TruncInst(Size, TD.getIntPtrType()));
ReplaceCallWith("memcpy", CI, CI->op_begin()+1, CI->op_end()-1,
(*(CI->op_begin()+1))->getType(), MemcpyFCache);
break;
}
case Intrinsic::memmove_i32: {
static Constant *MemmoveFCache = 0;
+ Value * Size = cast<Value>(CI->op_end()-1);
+ if (Size->getType() != TD.getIntPtrType())
+ Size->replaceAllUsesWith(new ZExtInst(Size, TD.getIntPtrType()));
ReplaceCallWith("memmove", CI, CI->op_begin()+1, CI->op_end()-1,
(*(CI->op_begin()+1))->getType(), MemmoveFCache);
break;
}
case Intrinsic::memmove_i64: {
static Constant *MemmoveFCache = 0;
+ Value * Size = cast<Value>(CI->op_end()-1);
+ if (Size->getType() != TD.getIntPtrType())
+ Size->replaceAllUsesWith(new TruncInst(Size, TD.getIntPtrType()));
ReplaceCallWith("memmove", CI, CI->op_begin()+1, CI->op_end()-1,
(*(CI->op_begin()+1))->getType(), MemmoveFCache);
break;
}
case Intrinsic::memset_i32: {
static Constant *MemsetFCache = 0;
+ Value * Size = cast<Value>(CI->op_end()-1);
+ if (Size->getType() != TD.getIntPtrType())
+ Size->replaceAllUsesWith(new ZExtInst(Size, TD.getIntPtrType()));
ReplaceCallWith("memset", CI, CI->op_begin()+1, CI->op_end()-1,
(*(CI->op_begin()+1))->getType(), MemsetFCache);
}
case Intrinsic::memset_i64: {
static Constant *MemsetFCache = 0;
+ Value * Size = cast<Value>(CI->op_end()-1);
+ if (Size->getType() != TD.getIntPtrType())
+ Size->replaceAllUsesWith(new TruncInst(Size, TD.getIntPtrType()));
ReplaceCallWith("memset", CI, CI->op_begin()+1, CI->op_end()-1,
(*(CI->op_begin()+1))->getType(), MemsetFCache);
break;
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
