commit b88e8dd31d1364d288d970f9187342a33b8de149
author Nadav Rotem <nadav.rotem@intel.com> Thu May 10 12:50:02 2012 +0000
committer Nadav Rotem <nadav.rotem@intel.com> Thu May 10 12:50:02 2012 +0000
tree 03fdeace4068bfd80e9fd864a9469508cb3c4b20
parent b210651654e64bec5eb14214a61da52c451a4044

Fix merge-typo and cleanup

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@156541 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/X86/X86ISelLowering.cpp

diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index a7e72e05..688c25c 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -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 ||