reapply the (corrected) patch to use the new llvm intrinsics for memcpy/memmove etc.

llvm-svn: 59824

1 files changed, 4 insertions, 2 deletions

diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index 1b554b22055..28f93c00f12 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -327,14 +327,16 @@ 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_i64);
+    const llvm::Type *SizeTy = llvm::Type::Int64Ty;
+    llvm::Value *MemSet = CGF.CGM.getIntrinsic(llvm::Intrinsic::memset,
+                                               &SizeTy, 1);
     uint64_t Size = CGF.getContext().getTypeSize(T);
     
     const llvm::Type *BP = llvm::PointerType::getUnqual(llvm::Type::Int8Ty);
     llvm::Value* DestPtr = Builder.CreateBitCast(LV.getAddress(), BP, "tmp");
     Builder.CreateCall4(MemSet, DestPtr, 
                         llvm::ConstantInt::get(llvm::Type::Int8Ty, 0),
-                        llvm::ConstantInt::get(llvm::Type::Int64Ty, Size/8),
+                        llvm::ConstantInt::get(SizeTy, Size/8),
                         llvm::ConstantInt::get(llvm::Type::Int32Ty, 0));
   }
 }