aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadav Rotem <nadav.rotem@intel.com>2012-05-10 12:50:02 +0000
committerNadav Rotem <nadav.rotem@intel.com>2012-05-10 12:50:02 +0000
commitb88e8dd31d1364d288d970f9187342a33b8de149 (patch)
tree03fdeace4068bfd80e9fd864a9469508cb3c4b20
parentb210651654e64bec5eb14214a61da52c451a4044 (diff)
Fix merge-typo and cleanup
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@156541 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/X86/X86ISelLowering.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index a7e72e05f7..688c25c6a2 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -4980,11 +4980,9 @@ X86TargetLowering::LowerVectorBroadcast(SDValue &Op, SelectionDAG &DAG) const {
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 ||