[llvm-commits] [llvm] r49761 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/memset64-on-x86-32.ll

[Dan Gohman]

Author: djg
Date: Tue Apr 15 20:32:32 2008
New Revision: 49761

URL: http://llvm.org/viewvc/llvm-project?rev=49761&view=rev
Log:
Recreate the size SDNode instead of reusing the old one in the x86
memcpy lowering code; this ensures that the size node has the desired
result type. This fixes a regression from r49572 with @llvm.memcpy.i64
on x86-32.

Added:
    llvm/trunk/test/CodeGen/X86/memset64-on-x86-32.ll
Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=49761&r1=49760&r2=49761&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Apr 15 20:32:32 2008
@@ -4731,7 +4731,7 @@
       default:  // Byte aligned
         AVT = MVT::i8;
         ValReg = X86::AL;
-        Count = Size;
+        Count = DAG.getIntPtrConstant(SizeVal);
         break;
     }
 
@@ -4746,7 +4746,7 @@
     InFlag = Chain.getValue(1);
   } else {
     AVT = MVT::i8;
-    Count  = Size;
+    Count  = DAG.getIntPtrConstant(SizeVal);
     Chain  = DAG.getCopyToReg(Chain, X86::AL, Src, InFlag);
     InFlag = Chain.getValue(1);
   }

Added: llvm/trunk/test/CodeGen/X86/memset64-on-x86-32.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/memset64-on-x86-32.ll?rev=49761&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/memset64-on-x86-32.ll (added)
+++ llvm/trunk/test/CodeGen/X86/memset64-on-x86-32.ll Tue Apr 15 20:32:32 2008
@@ -0,0 +1,13 @@
+; RUN: llvm-as < %s | llc -march=x86 | grep stosb
+
+target triple = "i386-apple-darwin9"
+        %struct.S = type { [80 x i8] }
+
+define %struct.S* @bork() {
+entry:
+        call void @llvm.memset.i64( i8* null, i8 0, i64 80, i32 1 )
+        ret %struct.S* null
+}
+
+declare void @llvm.memset.i64(i8*, i8, i64, i32) nounwind
+