Removed handling of invalid cases

Author: npanchen

llvm/lib/Analysis/ConstantFolding.cpp

@@ -3769,20 +3769,14 @@ static Constant *ConstantFoldFixedVectorCall(
     if (NumElements == VecNumElements && StartingIndex == 0)
       return Vec;
 
-    const unsigned NonPoisonNumElements =
-        std::min(StartingIndex + NumElements, VecNumElements);
-    for (unsigned I = StartingIndex; I < NonPoisonNumElements; ++I) {
+    for (unsigned I = StartingIndex, E = StartingIndex + NumElements; I < E;
+         ++I) {
       Constant *Elt = Vec->getAggregateElement(I);
       if (!Elt)
         return nullptr;
       Result[I - StartingIndex] = Elt;
     }
 
-    // Remaining elements are poison since they are out of bounds.
-    for (unsigned I = NonPoisonNumElements, E = StartingIndex + NumElements;
-         I < E; ++I)
-      Result[I - StartingIndex] = PoisonValue::get(FVTy->getElementType());
-
     return ConstantVector::get(Result);
   }
   case Intrinsic::vector_insert: {
@@ -3801,15 +3795,9 @@ static Constant *ConstantFoldFixedVectorCall(
     if (SubVecNumElements == VecNumElements && IdxN == 0)
       return SubVec;
 
-    // Make sure indices are in the range [0, VecNumElements), otherwise the
-    // result is a poison value.
-    if (IdxN >= VecNumElements || IdxN + SubVecNumElements > VecNumElements ||
-        (IdxN % SubVecNumElements) != 0)
-      return PoisonValue::get(FVTy);
-
     for (unsigned I = 0; I < VecNumElements; ++I) {
       Constant *Elt;
-      if (I >= IdxN && I < IdxN + SubVecNumElements)
+      if (I < IdxN + SubVecNumElements)
         Elt = SubVec->getAggregateElement(I - IdxN);
       else
         Elt = Vec->getAggregateElement(I);

llvm/test/Transforms/InstSimplify/ConstProp/vector-calls.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
-; RUN: opt < %s -passes=instsimplify,verify -disable-verify -S | FileCheck %s
+; RUN: opt < %s -passes=instsimplify,verify -S | FileCheck %s
 
 define <3 x i32> @fold_vector_extract() {
 ; CHECK-LABEL: define <3 x i32> @fold_vector_extract() {
@@ -19,22 +19,6 @@ define <3 x i32> @fold_vector_extract_constexpr() {
   ret <3 x i32> %1
 }
 
-define <3 x i32> @fold_vector_extract_last_poison() {
-; CHECK-LABEL: define <3 x i32> @fold_vector_extract_last_poison() {
-; CHECK-NEXT:    ret <3 x i32> <i32 6, i32 7, i32 poison>
-;
-  %1 = call <3 x i32> @llvm.vector.extract.v3i32.v8i32(<8 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7>, i64 6)
-  ret <3 x i32> %1
-}
-
-define <3 x i32> @fold_vector_extract_poison() {
-; CHECK-LABEL: define <3 x i32> @fold_vector_extract_poison() {
-; CHECK-NEXT:    ret <3 x i32> poison
-;
-  %1 = call <3 x i32> @llvm.vector.extract.v3i32.v8i32(<8 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7>, i64 8)
-  ret <3 x i32> %1
-}
-
 define <8 x i32> @fold_vector_extract_nop() {
 ; CHECK-LABEL: define <8 x i32> @fold_vector_extract_nop() {
 ; CHECK-NEXT:    ret <8 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7>
@@ -59,22 +43,6 @@ define <8 x i32> @fold_vector_insert_nop() {
   ret <8 x i32> %1
 }
 
-define <8 x i32> @fold_vector_insert_poison_idx_range() {
-; CHECK-LABEL: define <8 x i32> @fold_vector_insert_poison_idx_range() {
-; CHECK-NEXT:    ret <8 x i32> poison
-;
-  %1 = call <8 x i32> @llvm.vector.insert.v8i32(<8 x i32> <i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8>, <6 x i32> <i32 9, i32 10, i32 11, i32 12, i32 13, i32 14>, i64 6)
-  ret <8 x i32> %1
-}
-
-define <8 x i32> @fold_vector_insert_poison_large_idx() {
-; CHECK-LABEL: define <8 x i32> @fold_vector_insert_poison_large_idx() {
-; CHECK-NEXT:    ret <8 x i32> poison
-;
-  %1 = call <8 x i32> @llvm.vector.insert.v8i32(<8 x i32> <i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8>, <6 x i32> <i32 9, i32 10, i32 11, i32 12, i32 13, i32 14>, i64 -2)
-  ret <8 x i32> %1
-}
-
 define <8 x i32> @fold_vector_interleave2() {
 ; CHECK-LABEL: define <8 x i32> @fold_vector_interleave2() {
 ; CHECK-NEXT:    ret <8 x i32> <i32 1, i32 5, i32 2, i32 6, i32 3, i32 7, i32 4, i32 8>