!fixup address comments, thanks

Author: fhahn

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -936,6 +936,11 @@ class VPIRMetadata {
   /// Copy constructor for cloning.
   VPIRMetadata(const VPIRMetadata &Other) : Metadata(Other.Metadata) {}
 
+  VPIRMetadata &operator=(const VPIRMetadata &Other) {
+    Metadata = Other.Metadata;
+    return *this;
+  }
+
   /// Add all metadata to \p I.
   void applyMetadata(Instruction &I) const;
 
@@ -944,7 +949,7 @@ class VPIRMetadata {
     Metadata.emplace_back(Kind, Node);
   }
 
-  /// Intersect the this VPIRMetada objet with \p MD, keeping only metadata
+  /// Intersect this VPIRMetada object with \p MD, keeping only metadata
   /// nodes in both.
   void intersect(const VPIRMetadata &MD);
 };

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -2612,12 +2612,8 @@ void VPlanTransforms::createInterleaveGroups(
   VPDominatorTree VPDT;
   VPDT.recalculate(Plan);
   for (const auto *IG : InterleaveGroups) {
-    // Get or create the start address for the interleave group.
-    auto *Start =
-        cast<VPWidenMemoryRecipe>(RecipeBuilder.getRecipe(IG->getMember(0)));
-
-    VPIRMetadata InterleaveMD(*Start);
     SmallVector<VPValue *, 4> StoredValues;
+    VPIRMetadata InterleaveMD;
     for (unsigned i = 0; i < IG->getFactor(); ++i) {
       Instruction *MemI = IG->getMember(i);
       if (!MemI)
@@ -2628,7 +2624,11 @@ void VPlanTransforms::createInterleaveGroups(
         continue;
       if (auto *StoreR = dyn_cast<VPWidenStoreRecipe>(MemR))
         StoredValues.push_back(StoreR->getStoredValue());
-      InterleaveMD.intersect(*MemR);
+
+      if (i == 0)
+        InterleaveMD = VPIRMetadata(*MemR);
+      else
+        InterleaveMD.intersect(*MemR);
     }
 
     bool NeedsMaskForGaps =
@@ -2644,6 +2644,9 @@ void VPlanTransforms::createInterleaveGroups(
             getLoadStorePointerOperand(IRInsertPos)->stripPointerCasts()))
       NW = Gep->getNoWrapFlags().withoutNoUnsignedWrap();
 
+    // Get or create the start address for the interleave group.
+    auto *Start =
+        cast<VPWidenMemoryRecipe>(RecipeBuilder.getRecipe(IG->getMember(0)));
     VPValue *Addr = Start->getAddr();
     VPRecipeBase *AddrDef = Addr->getDefiningRecipe();
     if (AddrDef && !VPDT.properlyDominates(AddrDef, InsertPos)) {