diff options
| -rw-r--r-- | lib/CodeGen/CGExprAgg.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 27 |
2 files changed, 25 insertions, 4 deletions
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp index 7caf6dfd7f..1b554b2205 100644 --- a/lib/CodeGen/CGExprAgg.cpp +++ b/lib/CodeGen/CGExprAgg.cpp @@ -327,7 +327,7 @@ void AggExprEmitter::EmitNullInitializationToLValue(LValue LV, QualType T) { // There's a potential optimization opportunity in combining // memsets; that would be easy for arrays, but relatively // difficult for structures with the current code. - llvm::Value *MemSet = CGF.CGM.getIntrinsic(llvm::Intrinsic::memset); + llvm::Value *MemSet = CGF.CGM.getIntrinsic(llvm::Intrinsic::memset_i64); uint64_t Size = CGF.getContext().getTypeSize(T); const llvm::Type *BP = llvm::PointerType::getUnqual(llvm::Type::Int8Ty); diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 029adba2b1..7ea52deb2a 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -757,17 +757,38 @@ llvm::Function *CodeGenModule::getIntrinsic(unsigned IID,const llvm::Type **Tys, llvm::Function *CodeGenModule::getMemCpyFn() { if (MemCpyFn) return MemCpyFn; - return MemCpyFn = getIntrinsic(llvm::Intrinsic::memcpy); + llvm::Intrinsic::ID IID; + switch (Context.Target.getPointerWidth(0)) { + default: assert(0 && "Unknown ptr width"); + case 16: IID = llvm::Intrinsic::memcpy_i16; break; + case 32: IID = llvm::Intrinsic::memcpy_i32; break; + case 64: IID = llvm::Intrinsic::memcpy_i64; break; + } + return MemCpyFn = getIntrinsic(IID); } llvm::Function *CodeGenModule::getMemMoveFn() { if (MemMoveFn) return MemMoveFn; - return MemMoveFn = getIntrinsic(llvm::Intrinsic::memmove); + llvm::Intrinsic::ID IID; + switch (Context.Target.getPointerWidth(0)) { + default: assert(0 && "Unknown ptr width"); + case 16: IID = llvm::Intrinsic::memmove_i16; break; + case 32: IID = llvm::Intrinsic::memmove_i32; break; + case 64: IID = llvm::Intrinsic::memmove_i64; break; + } + return MemMoveFn = getIntrinsic(IID); } llvm::Function *CodeGenModule::getMemSetFn() { if (MemSetFn) return MemSetFn; - return MemSetFn = getIntrinsic(llvm::Intrinsic::memset); + llvm::Intrinsic::ID IID; + switch (Context.Target.getPointerWidth(0)) { + default: assert(0 && "Unknown ptr width"); + case 16: IID = llvm::Intrinsic::memset_i16; break; + case 32: IID = llvm::Intrinsic::memset_i32; break; + case 64: IID = llvm::Intrinsic::memset_i64; break; + } + return MemSetFn = getIntrinsic(IID); } static void appendFieldAndPadding(CodeGenModule &CGM, |