Fix incorrectly resolved merge conflict

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_35@214822 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Schmidt 2014-08-04 23:47:21 +00:00
parent 710e7192ab
commit 81e74bc0ca

View File

@ -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.