[llvm-branch-commits] [llvm-branch] r119612 - in /llvm/branches/Apple/Morbo: lib/CodeGen/SelectionDAG/SelectionDAG.cpp test/CodeGen/X86/memset64-on-x86-32.ll test/CodeGen/X86/misaligned-memset.ll

[Dale Johannesen]

Author: johannes
Date: Wed Nov 17 19:58:48 2010
New Revision: 119612

URL: http://llvm.org/viewvc/llvm-project?rev=119612&view=rev
Log:
--- Merging r119605 into 'test':
A    test/CodeGen/X86/misaligned-memset.ll
U    test/CodeGen/X86/memset64-on-x86-32.ll
--- Merging r119605 into '.':  (adjusted)
U    lib/CodeGen/SelectionDAG/SelectionDAG.cpp

btw, correct PR number is 8366.


Added:
    llvm/branches/Apple/Morbo/test/CodeGen/X86/misaligned-memset.ll
      - copied unchanged from r119605, llvm/trunk/test/CodeGen/X86/misaligned-memset.ll
Modified:
    llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
    llvm/branches/Apple/Morbo/test/CodeGen/X86/memset64-on-x86-32.ll

Modified: llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=119612&r1=119611&r2=119612&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Wed Nov 17 19:58:48 2010
@@ -3491,7 +3491,7 @@
     SDValue Value = getMemsetValue(Src, VT, DAG, dl);
     SDValue Store = DAG.getStore(Chain, dl, Value,
                                  getMemBasePlusOffset(Dst, DstOff, DAG),
-                                 DstSV, DstSVOff + DstOff, isVol, false, 0);
+                                 DstSV, DstSVOff + DstOff, isVol, false, Align);
     OutChains.push_back(Store);
     DstOff += VTSize;
   }

Modified: llvm/branches/Apple/Morbo/test/CodeGen/X86/memset64-on-x86-32.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/test/CodeGen/X86/memset64-on-x86-32.ll?rev=119612&r1=119611&r2=119612&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/test/CodeGen/X86/memset64-on-x86-32.ll (original)
+++ llvm/branches/Apple/Morbo/test/CodeGen/X86/memset64-on-x86-32.ll Wed Nov 17 19:58:48 2010
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin   -mcpu=nehalem | grep movaps | count 5
+; RUN: llc < %s -mtriple=i386-apple-darwin   -mcpu=nehalem | grep movups | count 5
 ; RUN: llc < %s -mtriple=i386-apple-darwin   -mcpu=core2   | grep movl   | count 20
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=core2   | grep movq   | count 10