[llvm-commits] [dragonegg] r101886 - /dragonegg/branches/release_27/llvm-convert.cpp

[Duncan Sands]

Author: baldrick
Date: Tue Apr 20 02:37:22 2010
New Revision: 101886

URL: http://llvm.org/viewvc/llvm-project?rev=101886&view=rev
Log:
Undo commit 100426, which is incompatible with llvm-2.7:
Port commit 100303 (wangmp) from llvm-gcc, hopefully fixing the self-host build:
Reapply patch for adding support for address spaces and added a isVolatile field to memcpy, memmove, and memset.

Modified:
    dragonegg/branches/release_27/llvm-convert.cpp

Modified: dragonegg/branches/release_27/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/branches/release_27/llvm-convert.cpp?rev=101886&r1=101885&r2=101886&view=diff
==============================================================================
--- dragonegg/branches/release_27/llvm-convert.cpp (original)
+++ dragonegg/branches/release_27/llvm-convert.cpp Tue Apr 20 02:37:22 2010
@@ -1621,17 +1621,15 @@
                               unsigned Align) {
   const Type *SBP = Type::getInt8PtrTy(Context);
   const Type *IntPtr = TD.getIntPtrType(Context);
-  Value *Ops[5] = {
+  Value *Ops[4] = {
     Builder.CreateBitCast(DestPtr, SBP),
     Builder.CreateBitCast(SrcPtr, SBP),
     Builder.CreateIntCast(Size, IntPtr, /*isSigned*/true),
-    ConstantInt::get(Type::getInt32Ty(Context), Align),
-    ConstantInt::get(Type::getInt1Ty(Context), false)
+    ConstantInt::get(Type::getInt32Ty(Context), Align)
   };
-  const Type *ArgTypes[3] = { SBP, SBP, IntPtr };
 
   Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memcpy,
-                                               ArgTypes, 3), Ops, Ops+5);
+                                               &IntPtr, 1), Ops, Ops+4);
   return Ops[0];
 }
 
@@ -1639,17 +1637,15 @@
                                unsigned Align) {
   const Type *SBP = Type::getInt8PtrTy(Context);
   const Type *IntPtr = TD.getIntPtrType(Context);
-  Value *Ops[5] = {
+  Value *Ops[4] = {
     Builder.CreateBitCast(DestPtr, SBP),
     Builder.CreateBitCast(SrcPtr, SBP),
     Builder.CreateIntCast(Size, IntPtr, /*isSigned*/true),
-    ConstantInt::get(Type::getInt32Ty(Context), Align),
-    ConstantInt::get(Type::getInt1Ty(Context), false)
+    ConstantInt::get(Type::getInt32Ty(Context), Align)
   };
-  const Type *ArgTypes[3] = { SBP, SBP, IntPtr };
 
   Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memmove,
-                                               ArgTypes, 3), Ops, Ops+5);
+                                               &IntPtr, 1), Ops, Ops+4);
   return Ops[0];
 }
 
@@ -1657,17 +1653,15 @@
                               unsigned Align) {
   const Type *SBP = Type::getInt8PtrTy(Context);
   const Type *IntPtr = TD.getIntPtrType(Context);
-  Value *Ops[5] = {
+  Value *Ops[4] = {
     Builder.CreateBitCast(DestPtr, SBP),
     Builder.CreateIntCast(SrcVal, Type::getInt8Ty(Context), /*isSigned*/true),
     Builder.CreateIntCast(Size, IntPtr, /*isSigned*/true),
-    ConstantInt::get(Type::getInt32Ty(Context), Align),
-    ConstantInt::get(Type::getInt1Ty(Context), false)
+    ConstantInt::get(Type::getInt32Ty(Context), Align)
   };
-  const Type *ArgTypes[2] = { SBP, IntPtr };
 
   Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memset,
-                                               ArgTypes, 2), Ops, Ops+5);
+                                               &IntPtr, 1), Ops, Ops+4);
   return Ops[0];
 }