Use VPDominatorTree instead of VPDominatorTree pointer

Author: Mel-Chen

llvm/lib/Transforms/Vectorize/VPlan.cpp

@@ -222,9 +222,7 @@ VPTransformState::VPTransformState(const TargetTransformInfo *TTI,
                                    Loop *CurrentParentLoop, Type *CanonicalIVTy)
     : TTI(TTI), VF(VF), CFG(DT), LI(LI), Builder(Builder), ILV(ILV), Plan(Plan),
       CurrentParentLoop(CurrentParentLoop), LVer(nullptr),
-      TypeAnalysis(CanonicalIVTy), VPDT(new VPDominatorTree(*Plan)) {}
-
-VPTransformState::~VPTransformState() { delete VPDT; }
+      TypeAnalysis(CanonicalIVTy), VPDT(*Plan) {}
 
 Value *VPTransformState::get(VPValue *Def, const VPLane &Lane) {
   if (Def->isLiveIn())
@@ -269,8 +267,8 @@ Value *VPTransformState::get(VPValue *Def, bool NeedsScalar) {
   auto GetBroadcastInstrs = [this, Def](Value *V) {
     bool SafeToHoist =
         !Def->hasDefiningRecipe() ||
-        VPDT->properlyDominates(Def->getDefiningRecipe()->getParent(),
-                                Plan->getVectorPreheader());
+        VPDT.properlyDominates(Def->getDefiningRecipe()->getParent(),
+                               Plan->getVectorPreheader());
 
     if (VF.isScalar())
       return V;
@@ -994,9 +992,9 @@ void VPlan::execute(VPTransformState *State) {
   State->CFG.PrevVPBB = nullptr;
   State->CFG.ExitBB = State->CFG.PrevBB->getSingleSuccessor();
 
-  // Update VPDominatorTree since VPBasicBlock may be removed after State wsa
-  // constucted.
-  State->VPDT->recalculate(*this);
+  // Update VPDominatorTree since VPBasicBlock may be removed after State was
+  // constructed.
+  State->VPDT.recalculate(*this);
 
   // Disconnect VectorPreHeader from ExitBB in both the CFG and DT.
   BasicBlock *VectorPreHeader = State->CFG.PrevBB;

llvm/lib/Transforms/Vectorize/VPlanHelpers.h

@@ -16,6 +16,7 @@
 #define LLVM_TRANSFORMS_VECTORIZE_VPLANHELPERS_H
 
 #include "VPlanAnalysis.h"
+#include "VPlanDominatorTree.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
@@ -38,7 +39,6 @@ class VPRegionBlock;
 class VPlan;
 class Value;
 class LoopVersioning;
-class VPDominatorTree;
 
 /// Returns a calculation for the total number of elements for a given \p VF.
 /// For fixed width vectors this value is a constant, whereas for scalable
@@ -199,7 +199,6 @@ struct VPTransformState {
                    LoopInfo *LI, DominatorTree *DT, IRBuilderBase &Builder,
                    InnerLoopVectorizer *ILV, VPlan *Plan,
                    Loop *CurrentParentLoop, Type *CanonicalIVTy);
-  ~VPTransformState();
   /// Target Transform Info.
   const TargetTransformInfo *TTI;
 
@@ -355,7 +354,7 @@ struct VPTransformState {
   VPTypeAnalysis TypeAnalysis;
 
   /// VPlan-based dominator tree.
-  VPDominatorTree *VPDT = nullptr;
+  VPDominatorTree VPDT;
 };
 
 /// Struct to hold various analysis needed for cost computations.