[InstCombine] remove overzealous assert for shuffles (PR41419)

As the TODO indicates, instsimplify could be improved.

Should fix:
https://bugs.llvm.org/show_bug.cgi?id=41419

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@357910 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/InstCombine/InstCombineVectorOps.cpp b/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
index 665064c4c8d9518a5b45c39bd7e317fa4eb1ad9a..28d5f187c3dda3bba5e2a510832c88ec5facb1b8 100644 (file)
--- a/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
+++ b/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
@@ -1353,8 +1353,8 @@ static Instruction *foldSelectShuffle(ShuffleVectorInst &Shuf,
   // Canonicalize to choose from operand 0 first.
   unsigned NumElts = Shuf.getType()->getVectorNumElements();
   if (Shuf.getMaskValue(0) >= (int)NumElts) {
-    assert(!isa<UndefValue>(Shuf.getOperand(1)) &&
-           "Not expecting undef shuffle operand with select mask");
+    // TODO: Can we assert that both operands of a shuffle-select are not undef
+    // (otherwise, it would have been folded by instsimplify?
     Shuf.commute();
     return &Shuf;
   }

diff --git a/test/Transforms/InstCombine/shuffle_select.ll b/test/Transforms/InstCombine/shuffle_select.ll
index 991f390682aff1982af25ec51f097b1e2161d209..6cda586f913299490770bdabbb95ea66eca2274d 100644 (file)
--- a/test/Transforms/InstCombine/shuffle_select.ll
+++ b/test/Transforms/InstCombine/shuffle_select.ll
@@ -1454,3 +1454,13 @@ define <4 x i8> @or_add_2_vars(<4 x i8> %v, <4 x i8> %v1) {
   ret <4 x i8> %t3
 }
 
+; The undef operand is used to simplify the shuffle mask, but don't assert that too soon.
+
+define <4 x i32> @PR41419(<4 x i32> %v) {
+; CHECK-LABEL: @PR41419(
+; CHECK-NEXT:    ret <4 x i32> [[V:%.*]]
+;
+  %s = shufflevector <4 x i32> %v, <4 x i32> undef, <4 x i32> <i32 4, i32 5, i32 2, i32 7>
+  ret <4 x i32> %s
+}
+