From 91400211a473052d7b0a589acd13d46b7f270dcc Mon Sep 17 00:00:00 2001
From: James Cherry <cherry@parallaxsw.com>
Date: Sat, 1 Apr 2023 11:03:35 -0700
Subject: [PATCH] ArcDelayCalc mv input_port_ to RCDelayCalc

Signed-off-by: James Cherry <cherry@parallaxsw.com>
---
 dcalc/DmpCeff.cc           | 1 -
 dcalc/DmpCeff.hh           | 1 -
 dcalc/RCDelayCalc.cc       | 1 +
 dcalc/RCDelayCalc.hh       | 1 +
 dcalc/SimpleRCDelayCalc.cc | 1 +
 5 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dcalc/DmpCeff.cc b/dcalc/DmpCeff.cc
index 9a95417b..ff3a9f16 100644
--- a/dcalc/DmpCeff.cc
+++ b/dcalc/DmpCeff.cc
@@ -1550,7 +1550,6 @@ DmpCeffDelayCalc::inputPortDelay(const Pin *port_pin,
 				 const DcalcAnalysisPt *dcalc_ap)
 {
   dmp_alg_ = nullptr;
-  input_port_ = true;
   RCDelayCalc::inputPortDelay(port_pin, in_slew, rf, parasitic, dcalc_ap);
 }
 
diff --git a/dcalc/DmpCeff.hh b/dcalc/DmpCeff.hh
index 2844130b..5f8360d2 100644
--- a/dcalc/DmpCeff.hh
+++ b/dcalc/DmpCeff.hh
@@ -88,7 +88,6 @@ protected:
 			double rpi,
 			double c1);
 
-  bool input_port_;
   static bool unsuppored_model_warned_;
 
 private:
diff --git a/dcalc/RCDelayCalc.cc b/dcalc/RCDelayCalc.cc
index cb9c115c..3aec6224 100644
--- a/dcalc/RCDelayCalc.cc
+++ b/dcalc/RCDelayCalc.cc
@@ -48,6 +48,7 @@ RCDelayCalc::inputPortDelay(const Pin *,
   drvr_cell_ = nullptr;
   drvr_library_ = network_->defaultLibertyLibrary();
   multi_drvr_slew_factor_ = 1.0F;
+  input_port_ = true;
 }
 
 // For DSPF on an input port the elmore delay is used as the time
diff --git a/dcalc/RCDelayCalc.hh b/dcalc/RCDelayCalc.hh
index fcffefbc..24530959 100644
--- a/dcalc/RCDelayCalc.hh
+++ b/dcalc/RCDelayCalc.hh
@@ -41,6 +41,7 @@ protected:
 
   const LibertyCell *drvr_cell_;
   const Parasitic *drvr_parasitic_;
+  bool input_port_;
 };
 
 } // namespace
diff --git a/dcalc/SimpleRCDelayCalc.cc b/dcalc/SimpleRCDelayCalc.cc
index 634085a4..394e10e5 100644
--- a/dcalc/SimpleRCDelayCalc.cc
+++ b/dcalc/SimpleRCDelayCalc.cc
@@ -66,6 +66,7 @@ SimpleRCDelayCalc::gateDelay(const LibertyCell *drvr_cell,
 			     ArcDelay &gate_delay,
 			     Slew &drvr_slew)
 {
+  input_port_ = false;
   drvr_parasitic_ = drvr_parasitic;
   drvr_rf_ = arc->toEdge()->asRiseFall();
   drvr_cell_ = drvr_cell;