FindVertexDelays constructor

Signed-off-by: James Cherry <[email protected]>
htfab · Dec 16, 2021 · e20a0c7 · e20a0c7
1 parent 104f900
commit e20a0c7
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/dcalc/GraphDelayCalc1.cc b/dcalc/GraphDelayCalc1.cc
@@ -352,41 +352,34 @@ GraphDelayCalc1::deleteVertexBefore(Vertex *vertex)
 class FindVertexDelays : public VertexVisitor
 {
 public:
-  FindVertexDelays(GraphDelayCalc1 *graph_delay_calc1,
-		   ArcDelayCalc *arc_delay_calc,
-		   bool own_arc_delay_calc);
+  FindVertexDelays(GraphDelayCalc1 *graph_delay_calc1);
   virtual ~FindVertexDelays();
   virtual void visit(Vertex *vertex);
   virtual VertexVisitor *copy() const;
 
 protected:
   GraphDelayCalc1 *graph_delay_calc1_;
   ArcDelayCalc *arc_delay_calc_;
-  bool own_arc_delay_calc_;
 };
 
-FindVertexDelays::FindVertexDelays(GraphDelayCalc1 *graph_delay_calc1,
-				   ArcDelayCalc *arc_delay_calc,
-				   bool own_arc_delay_calc) :
+FindVertexDelays::FindVertexDelays(GraphDelayCalc1 *graph_delay_calc1) :
   VertexVisitor(),
   graph_delay_calc1_(graph_delay_calc1),
-  arc_delay_calc_(arc_delay_calc),
-  own_arc_delay_calc_(own_arc_delay_calc)
+  arc_delay_calc_(graph_delay_calc1_->arc_delay_calc_->copy())
 {
 }
 
 FindVertexDelays::~FindVertexDelays()
 {
-  if (own_arc_delay_calc_)
-    delete arc_delay_calc_;
+  delete arc_delay_calc_;
 }
 
 VertexVisitor *
 FindVertexDelays::copy() const
 {
   // Copy StaState::arc_delay_calc_ because it needs separate state
   // for each thread.
-  return new FindVertexDelays(graph_delay_calc1_,arc_delay_calc_->copy(),true);
+  return new FindVertexDelays(graph_delay_calc1_);
 }
 
 void
@@ -416,7 +409,7 @@ GraphDelayCalc1::findDelays(Level level)
     if (incremental_)
       seedInvalidDelays();
 
-    FindVertexDelays visitor(this, arc_delay_calc_, false);
+    FindVertexDelays visitor(this);
     dcalc_count += iter_->visitParallel(level, &visitor);
 
     // Timing checks require slews at both ends of the arc,