Commit 869abd3c authored by Bill Schmidt's avatar Bill Schmidt
Browse files

Fix incorrectly resolved merge conflict 

llvm-svn: 214822
parent d7eab863

llvm/lib/Target/PowerPC/PPCISelLowering.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ int PPC::isVSLDOIShuffleMask(SDNode *N, bool isUnary, SelectionDAG &DAG) { 
  unsigned ShiftAmt = SVOp->getMaskElt(i);

  if (ShiftAmt < i) return -1;



  if (DAG.getTarget().getDataLayout()->isLittleEndian()) {

  ShiftAmt -= i;



  if (!isUnary) {

    // Check the rest of the elements to see if they are consecutive.