diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -1102,6 +1102,8 @@
       if (Instr && Instr->hasPoisonGeneratingFlags()) {
         if (auto *VPW = dyn_cast<VPWidenRecipe>(CurRec))
           VPW->dropPoisonGeneratingFlags();
+        else if (auto *GEP = dyn_cast<VPWidenGEPRecipe>(CurRec))
+          GEP->dropPoisonGeneratingFlags();
         else
           State.MayGeneratePoisonRecipes.insert(CurRec);
       }
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.h b/llvm/lib/Transforms/Vectorize/VPlan.h
--- a/llvm/lib/Transforms/Vectorize/VPlan.h
+++ b/llvm/lib/Transforms/Vectorize/VPlan.h
@@ -942,6 +942,7 @@
   unsigned HasNUW : 1;
   unsigned HasNSW : 1;
   unsigned IsExact : 1;
+  unsigned IsInBounds : 1;
   unsigned AllowReassoc : 1;
   unsigned NoNaNs : 1;
   unsigned NoInfs : 1;
@@ -957,6 +958,8 @@
       HasNSW = Op->hasNoSignedWrap();
     } else if (auto *Op = dyn_cast<PossiblyExactOperator>(&I)) {
       IsExact = Op->isExact();
+    } else if (auto *GEP = dyn_cast<GetElementPtrInst>(&I)) {
+      IsInBounds = GEP->isInBounds();
     } else if (auto *Op = dyn_cast<FPMathOperator>(&I)) {
       FastMathFlags FMF = Op->getFastMathFlags();
       AllowReassoc = FMF.allowReassoc();
@@ -974,6 +977,7 @@
     HasNUW = false;
     HasNSW = false;
     IsExact = false;
+    IsInBounds = false;
     NoNaNs = false;
     NoInfs = false;
   }
@@ -981,6 +985,7 @@
   bool hasNoUnsignedWrap() const { return HasNUW; }
   bool hasNoSignedWrap() const { return HasNSW; }
   bool isExact() const { return IsExact; }
+  bool isInBounds() const { return IsInBounds; }
   FastMathFlags getFastMathFlags() const {
     FastMathFlags FMFs;
     FMFs.setAllowReassoc(AllowReassoc);
@@ -1001,6 +1006,8 @@
       I->setHasNoUnsignedWrap();
     if (hasNoSignedWrap())
       I->setHasNoSignedWrap();
+    if (isInBounds())
+      cast<GetElementPtrInst>(I)->setIsInBounds();
     if (getFastMathFlags().any())
       I->setFastMathFlags(getFastMathFlags());
   }
@@ -1131,7 +1138,7 @@
 };
 
 /// A recipe for handling GEP instructions.
-class VPWidenGEPRecipe : public VPRecipeBase, public VPValue {
+class VPWidenGEPRecipe : public VPRecipeBase, public VPValue, public VPIRFlags {
   bool isPointerLoopInvariant() const {
     return getOperand(0)->isDefinedOutsideVectorRegions();
   }
@@ -1149,7 +1156,8 @@
 public:
   template <typename IterT>
   VPWidenGEPRecipe(GetElementPtrInst *GEP, iterator_range<IterT> Operands)
-      : VPRecipeBase(VPDef::VPWidenGEPSC, Operands), VPValue(this, GEP) {}
+      : VPRecipeBase(VPDef::VPWidenGEPSC, Operands), VPValue(this, GEP),
+        VPIRFlags(*GEP) {}
 
   ~VPWidenGEPRecipe() override = default;
 
diff --git a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
--- a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
@@ -801,6 +801,7 @@
     //       collectLoopScalars() and teach getVectorValue() to broadcast
     //       the lane-zero scalar value.
     auto *Clone = State.Builder.Insert(GEP->clone());
+    cast<GetElementPtrInst>(Clone)->setIsInBounds(isInBounds());
     for (unsigned Part = 0; Part < State.UF; ++Part) {
       Value *EntryPart = State.Builder.CreateVectorSplat(State.VF, Clone);
       State.set(this, EntryPart, Part);
@@ -832,18 +833,10 @@
           Indices.push_back(State.get(Operand, Part));
       }
 
-      // If the GEP instruction is vectorized and was in a basic block that
-      // needed predication, we can't propagate the poison-generating 'inbounds'
-      // flag. The control flow has been linearized and the GEP is no longer
-      // guarded by the predicate, which could make the 'inbounds' properties to
-      // no longer hold.
-      bool IsInBounds =
-          GEP->isInBounds() && State.MayGeneratePoisonRecipes.count(this) == 0;
-
       // Create the new GEP. Note that this GEP may be a scalar if VF == 1,
       // but it should be a vector, otherwise.
       auto *NewGEP = State.Builder.CreateGEP(GEP->getSourceElementType(), Ptr,
-                                             Indices, "", IsInBounds);
+                                             Indices, "", isInBounds());
       assert((State.VF.isScalar() || NewGEP->getType()->isVectorTy()) &&
              "NewGEP is not a pointer vector");
       State.set(this, NewGEP, Part);