[llvm-commits] [llvm] r156541 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

[Nadav Rotem]

Author: nadav
Date: Thu May 10 07:50:02 2012
New Revision: 156541

URL: http://llvm.org/viewvc/llvm-project?rev=156541&view=rev
Log:
Fix merge-typo and cleanup

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=156541&r1=156540&r2=156541&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu May 10 07:50:02 2012
@@ -4980,11 +4980,9 @@
         return SDValue();
 
       SDValue Sc = Op.getOperand(0);
-      if (Sc.getOpcode() == ISD::SCALAR_TO_VECTOR)
-        Ld = Sc.getOperand(0);
-      else if (Sc.getOpcode() == ISD::BUILD_VECTOR)
-        Ld = Sc.getOperand(0);
-      else return SDValue();
+      if (Sc.getOpcode() != ISD::SCALAR_TO_VECTOR &&
+          Sc.getOpcode() != ISD::BUILD_VECTOR)
+        return SDValue();
 
       Ld = Sc.getOperand(0);
       ConstSplatVal = (Ld.getOpcode() == ISD::Constant ||