From b88e8dd31d1364d288d970f9187342a33b8de149 Mon Sep 17 00:00:00 2001 From: Nadav Rotem Date: Thu, 10 May 2012 12:50:02 +0000 Subject: [PATCH] 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 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index a7e72e05f7a..688c25c6a25 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 ||