[llvm-commits] [llvm-gcc-4.2] r59825 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

[Chris Lattner]

Author: lattner
Date: Fri Nov 21 10:43:52 2008
New Revision: 59825

URL: http://llvm.org/viewvc/llvm-project?rev=59825&view=rev
Log:
update llvm-gcc to match the change in the llvm.memset intrinsics.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=59825&r1=59824&r2=59825&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Nov 21 10:43:52 2008
@@ -1492,9 +1492,8 @@
     ConstantInt::get(Type::Int32Ty, Align)
   };
 
-  Intrinsic::ID IID = 
-    (IntPtr == Type::Int32Ty) ? Intrinsic::memcpy_i32 : Intrinsic::memcpy_i64;
-  Builder.CreateCall(Intrinsic::getDeclaration(TheModule, IID), Ops, Ops+4);
+  Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memcpy,
+                                               &IntPtr, 1), Ops, Ops+4);
 }
 
 void TreeToLLVM::EmitMemMove(Value *DestPtr, Value *SrcPtr, Value *Size, 
@@ -1508,9 +1507,8 @@
     ConstantInt::get(Type::Int32Ty, Align)
   };
 
-  Intrinsic::ID IID = 
-    (IntPtr == Type::Int32Ty) ? Intrinsic::memmove_i32 : Intrinsic::memmove_i64;
-  Builder.CreateCall(Intrinsic::getDeclaration(TheModule, IID), Ops, Ops+4);
+  Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memmove,
+                                               &IntPtr, 1), Ops, Ops+4);
 }
 
 void TreeToLLVM::EmitMemSet(Value *DestPtr, Value *SrcVal, Value *Size, 
@@ -1523,11 +1521,9 @@
     CastToSIntType(Size, IntPtr),
     ConstantInt::get(Type::Int32Ty, Align)
   };
-
-  Intrinsic::ID IID = 
-    (IntPtr == Type::Int32Ty) ? Intrinsic::memset_i32 : Intrinsic::memset_i64;
   
-  Builder.CreateCall(Intrinsic::getDeclaration(TheModule, IID), Ops, Ops+4);
+  Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memset,
+                                               &IntPtr, 1), Ops, Ops+4);
 }