[llvm-branch-commits] [llvm-branch] r100178 - /llvm/branches/Apple/Morbo/lib/Target/X86/X86ISelLowering.cpp

[Evan Cheng]

Author: evancheng
Date: Fri Apr  2 00:41:04 2010
New Revision: 100178

URL: http://llvm.org/viewvc/llvm-project?rev=100178&view=rev
Log:
Merge 100167.

Modified:
    llvm/branches/Apple/Morbo/lib/Target/X86/X86ISelLowering.cpp

Modified: llvm/branches/Apple/Morbo/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Target/X86/X86ISelLowering.cpp?rev=100178&r1=100177&r2=100178&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Target/X86/X86ISelLowering.cpp Fri Apr  2 00:41:04 2010
@@ -1084,8 +1084,8 @@
   if (!F->hasFnAttr(Attribute::NoImplicitFloat)) {
     if (Size >= 16 &&
         (Subtarget->isUnalignedMemAccessFast() ||
-         (DstAlign == 0 || DstAlign >= 16) &&
-         (SrcAlign == 0 || SrcAlign >= 16)) &&
+         ((DstAlign == 0 || DstAlign >= 16) &&
+          (SrcAlign == 0 || SrcAlign >= 16))) &&
         Subtarget->getStackAlignment() >= 16) {
       if (Subtarget->hasSSE2())
         return MVT::v4i32;