Revert r100193 since it causes failures in objc in clang

llvm-svn: 100200
This commit is contained in:
Mon P Wang
2010-04-02 18:43:42 +00:00
parent 999c1b927b
commit f7f3bff646
10 changed files with 52 additions and 99 deletions

View File

@@ -47,7 +47,8 @@ CodeGenModule::CodeGenModule(ASTContext &C, const CodeGenOptions &CGO,
Features(C.getLangOptions()), CodeGenOpts(CGO), TheModule(M),
TheTargetData(TD), TheTargetCodeGenInfo(0), Diags(diags),
Types(C, M, TD, getTargetCodeGenInfo().getABIInfo()),
MangleCtx(C), VTables(*this), Runtime(0), CFConstantStringClassRef(0),
MangleCtx(C), VTables(*this), Runtime(0),
MemCpyFn(0), MemMoveFn(0), MemSetFn(0), CFConstantStringClassRef(0),
VMContext(M.getContext()) {
if (!Features.ObjC1)
@@ -1413,25 +1414,22 @@ llvm::Function *CodeGenModule::getIntrinsic(unsigned IID,const llvm::Type **Tys,
(llvm::Intrinsic::ID)IID, Tys, NumTys);
}
llvm::Function *CodeGenModule::getMemCpyFn(const llvm::Type *DestType,
const llvm::Type *SrcType,
const llvm::Type *SizeType) {
const llvm::Type *ArgTypes[3] = {DestType, SrcType, SizeType };
return getIntrinsic(llvm::Intrinsic::memcpy, ArgTypes, 3);
llvm::Function *CodeGenModule::getMemCpyFn() {
if (MemCpyFn) return MemCpyFn;
const llvm::Type *IntPtr = TheTargetData.getIntPtrType(VMContext);
return MemCpyFn = getIntrinsic(llvm::Intrinsic::memcpy, &IntPtr, 1);
}
llvm::Function *CodeGenModule::getMemMoveFn(const llvm::Type *DestType,
const llvm::Type *SrcType,
const llvm::Type *SizeType) {
const llvm::Type *ArgTypes[3] = {DestType, SrcType, SizeType };
return getIntrinsic(llvm::Intrinsic::memmove, ArgTypes, 3);
llvm::Function *CodeGenModule::getMemMoveFn() {
if (MemMoveFn) return MemMoveFn;
const llvm::Type *IntPtr = TheTargetData.getIntPtrType(VMContext);
return MemMoveFn = getIntrinsic(llvm::Intrinsic::memmove, &IntPtr, 1);
}
llvm::Function *CodeGenModule::getMemSetFn(const llvm::Type *DestType,
const llvm::Type *SizeType) {
const llvm::Type *ArgTypes[2] = { DestType, SizeType };
return getIntrinsic(llvm::Intrinsic::memset, ArgTypes, 2);
llvm::Function *CodeGenModule::getMemSetFn() {
if (MemSetFn) return MemSetFn;
const llvm::Type *IntPtr = TheTargetData.getIntPtrType(VMContext);
return MemSetFn = getIntrinsic(llvm::Intrinsic::memset, &IntPtr, 1);
}
static llvm::StringMapEntry<llvm::Constant*> &