!fixup address comments, thanks

Author: fhahn

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -950,7 +950,7 @@ class VPIRMetadata {
   }
 
   /// Intersect this VPIRMetada object with \p MD, keeping only metadata
-  /// nodes in both.
+  /// nodes that are common to both.
   void intersect(const VPIRMetadata &MD);
 };
 

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -1561,14 +1561,16 @@ void VPIRMetadata::applyMetadata(Instruction &I) const {
 }
 
 void VPIRMetadata::intersect(const VPIRMetadata &Other) {
-  SmallVector<std::pair<unsigned, MDNode *>> MetadataUnion;
+  SmallVector<std::pair<unsigned, MDNode *>> MetadataIntersection;
   for (const auto &[KindA, MDA] : Metadata) {
     for (const auto &[KindB, MDB] : Other.Metadata) {
-      if (KindA == KindB && MDA == MDB)
-        MetadataUnion.emplace_back(KindA, MDA);
+      if (KindA == KindB && MDA == MDB) {
+        MetadataIntersection.emplace_back(KindA, MDA);
+        break;
+      }
     }
   }
-  Metadata = std::move(MetadataUnion);
+  Metadata = std::move(MetadataIntersection);
 }
 
 void VPWidenCallRecipe::execute(VPTransformState &State) {

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -2614,21 +2614,19 @@ void VPlanTransforms::createInterleaveGroups(
   for (const auto *IG : InterleaveGroups) {
     auto *Start =
         cast<VPWidenMemoryRecipe>(RecipeBuilder.getRecipe(IG->getMember(0)));
-
     VPIRMetadata InterleaveMD(*Start);
     SmallVector<VPValue *, 4> StoredValues;
     if (auto *StoreR = dyn_cast<VPWidenStoreRecipe>(Start))
       StoredValues.push_back(StoreR->getStoredValue());
     for (unsigned I = 1; I < IG->getFactor(); ++I) {
-      Instruction *MemI = IG->getMember(I);
-      if (!MemI)
+      Instruction *MemberI = IG->getMember(I);
+      if (!MemberI)
         continue;
-      VPWidenMemoryRecipe *MemR =
-          cast<VPWidenMemoryRecipe>(RecipeBuilder.getRecipe(MemI));
-      if (!StoredValues.empty())
-        StoredValues.push_back(
-            cast<VPWidenStoreRecipe>(MemR)->getStoredValue());
-      InterleaveMD.intersect(*MemR);
+      VPWidenMemoryRecipe *MemoryR =
+          cast<VPWidenMemoryRecipe>(RecipeBuilder.getRecipe(MemberI));
+      if (auto *StoreR = dyn_cast<VPWidenStoreRecipe>(MemoryR))
+        StoredValues.push_back(StoreR->getStoredValue());
+      InterleaveMD.intersect(*MemoryR);
     }
 
     bool NeedsMaskForGaps =