Fixes a case where we generate an incorrect mask for pshfhw in the presence
of undefs and incorrectly determining if we have punpckldq.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63702 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 416029b..043e551 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -2317,7 +2317,7 @@
if (!isUndefOrEqual(BitI, j))
return false;
if (V2IsSplat) {
- if (isUndefOrEqual(BitI1, NumElts))
+ if (!isUndefOrEqual(BitI1, NumElts))
return false;
} else {
if (!isUndefOrEqual(BitI1, j + NumElts))
@@ -2652,9 +2652,10 @@
for (unsigned i = 7; i >= 4; --i) {
unsigned Val = 0;
SDValue Arg = N->getOperand(i);
- if (Arg.getOpcode() != ISD::UNDEF)
+ if (Arg.getOpcode() != ISD::UNDEF) {
Val = cast<ConstantSDNode>(Arg)->getZExtValue();
- Mask |= (Val - 4);
+ Mask |= (Val - 4);
+ }
if (i != 4)
Mask <<= 2;
}
@@ -4200,10 +4201,10 @@
// new vector_shuffle with the corrected mask.
SDValue NewMask = NormalizeMask(PermMask, DAG);
if (NewMask.getNode() != PermMask.getNode()) {
- if (X86::isUNPCKLMask(PermMask.getNode(), true)) {
+ if (X86::isUNPCKLMask(NewMask.getNode(), true)) {
SDValue NewMask = getUnpacklMask(NumElems, DAG, dl);
return DAG.getNode(ISD::VECTOR_SHUFFLE, dl, VT, V1, V2, NewMask);
- } else if (X86::isUNPCKHMask(PermMask.getNode(), true)) {
+ } else if (X86::isUNPCKHMask(NewMask.getNode(), true)) {
SDValue NewMask = getUnpackhMask(NumElems, DAG, dl);
return DAG.getNode(ISD::VECTOR_SHUFFLE, dl, VT, V1, V2, NewMask);
}