DAGCombiner: Generate a correct constant for vector types when folding (xor (and)) into (and (not)).

PR15948.

llvm-svn: 181597

2 files changed, 12 insertions, 2 deletions

diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 700ee12072c..c54dffbb132 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -3464,8 +3464,7 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
   if (N0.getOpcode() == ISD::AND && N0.getNode()->hasOneUse() &&
       N0->getOperand(1) == N1) {
     SDValue X = N0->getOperand(0);
-    SDValue NotX = DAG.getNode(ISD::XOR, X.getDebugLoc(), VT, X,
-      DAG.getConstant(APInt::getAllOnesValue(VT.getSizeInBits()), VT));
+    SDValue NotX = DAG.getNOT(X.getDebugLoc(), X, VT);
     AddToWorkList(NotX.getNode());
     return DAG.getNode(ISD::AND, N->getDebugLoc(), VT, NotX, N1);
   }
diff --git a/llvm/test/CodeGen/X86/xor.ll b/llvm/test/CodeGen/X86/xor.ll
index 2408bfe72c6..574bb7817e4 100644
--- a/llvm/test/CodeGen/X86/xor.ll
+++ b/llvm/test/CodeGen/X86/xor.ll
@@ -154,3 +154,14 @@ define i32 @test9(i32 %a) nounwind {
 ; X32:    notl	[[REG:%[a-z]+]]
 ; X32:    andl	{{.*}}[[REG:%[a-z]+]]
 }
+
+; PR15948
+define <4 x i32> @test10(<4 x i32> %a) nounwind {
+  %1 = and <4 x i32> %a, <i32 4096, i32 4096, i32 4096, i32 4096>
+  %2 = xor <4 x i32> %1, <i32 4096, i32 4096, i32 4096, i32 4096>
+  ret <4 x i32> %2
+; X64: test10:
+; X64:    andnps
+; X32: test10:
+; X32:    andnps
+}