From f6d397ce72520972ddcaabfe0a89c3f59a18f250 Mon Sep 17 00:00:00 2001
From: James Cherry <cherry@parallaxsw.com>
Date: Fri, 14 Jun 2019 08:46:41 -0700
Subject: [PATCH] ConcreteParasitics::deleteReducedParasitics

---
 parasitics/ConcreteParasitics.cc |  6 ++--
 search/CheckSlewLimits.cc        | 48 ++++++++++++++++----------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/parasitics/ConcreteParasitics.cc b/parasitics/ConcreteParasitics.cc
index 3a60b68f..6ac1bf6d 100644
--- a/parasitics/ConcreteParasitics.cc
+++ b/parasitics/ConcreteParasitics.cc
@@ -1006,8 +1006,10 @@ ConcreteParasitics::deleteReducedParasitics(const Pin *pin)
 {
   if (!drvr_parasitic_map_.empty()) {
     PinSet *drivers = network_->drivers(pin);
-    for (auto drvr_pin : *drivers)
-      deleteDrvrReducedParasitics(drvr_pin);
+    if (drivers) {
+      for (auto drvr_pin : *drivers)
+	deleteDrvrReducedParasitics(drvr_pin);
+    }
   }
 }
 
diff --git a/search/CheckSlewLimits.cc b/search/CheckSlewLimits.cc
index 6ae97e25..a7ed413e 100644
--- a/search/CheckSlewLimits.cc
+++ b/search/CheckSlewLimits.cc
@@ -91,7 +91,7 @@ CheckSlewLimits::init(const MinMax *min_max)
   float top_limit;
   bool top_limit_exists;
   sta_->sdc()->slewLimit(top_cell, min_max,
-				 top_limit, top_limit_exists);
+			 top_limit, top_limit_exists);
   top_limit_= top_limit;
   top_limit_exists_ = top_limit_exists;
 }
@@ -175,11 +175,11 @@ CheckSlewLimits::findLimit(const Pin *pin,
 			   const TransRiseFall *tr,
 			   const MinMax *min_max,
 			   // Return values.
-			   float &limit1,
-			   bool &limit1_exists) const
+			   float &limit,
+			   bool &exists) const
 			
 {
-  limit1_exists = false;
+  exists = false;
   const Network *network = sta_->network();
   Sdc *sdc = sta_->sdc();
   bool is_clk = sta_->search()->isClock(vertex);
@@ -193,19 +193,19 @@ CheckSlewLimits::findLimit(const Pin *pin,
     float clk_limit;
     bool clk_limit_exists;
     sdc->slewLimit(clk, tr, clk_data, min_max,
-			   clk_limit, clk_limit_exists);
+		   clk_limit, clk_limit_exists);
     if (clk_limit_exists
-	&& (!limit1_exists
-	    || min_max->compare(limit1, clk_limit))) {
+	&& (!exists
+	    || min_max->compare(limit, clk_limit))) {
       // Use the tightest clock limit.
-      limit1 = clk_limit;
-      limit1_exists = true;
+      limit = clk_limit;
+      exists = true;
     }
   }
-  if (!limit1_exists) {
+  if (!exists) {
     // Default to top ("design") limit.
-    limit1_exists = top_limit_exists_;
-    limit1 = top_limit_;
+    exists = top_limit_exists_;
+    limit = top_limit_;
     if (network->isTopLevelPort(pin)) {
       Port *port = network->port(pin);
       float port_limit;
@@ -213,10 +213,10 @@ CheckSlewLimits::findLimit(const Pin *pin,
       sdc->slewLimit(port, min_max, port_limit, port_limit_exists);
       // Use the tightest limit.
       if (port_limit_exists
-	  && (!limit1_exists
-	      || min_max->compare(limit1, port_limit))) {
-	limit1 = port_limit;
-	limit1_exists = true;
+	  && (!exists
+	      || min_max->compare(limit, port_limit))) {
+	limit = port_limit;
+	exists = true;
       }
     }
     else {
@@ -226,10 +226,10 @@ CheckSlewLimits::findLimit(const Pin *pin,
 			     pin_limit, pin_limit_exists);
       // Use the tightest limit.
       if (pin_limit_exists
-	  && (!limit1_exists
-	      || min_max->compare(limit1, pin_limit))) {
-	limit1 = pin_limit;
-	limit1_exists = true;
+	  && (!exists
+	      || min_max->compare(limit, pin_limit))) {
+	limit = pin_limit;
+	exists = true;
       }
 
       float port_limit;
@@ -239,10 +239,10 @@ CheckSlewLimits::findLimit(const Pin *pin,
 	port->slewLimit(min_max, port_limit, port_limit_exists);
 	// Use the tightest limit.
 	if (port_limit_exists
-	    && (!limit1_exists
-		|| min_max->compare(limit1, port_limit))) {
-	  limit1 = port_limit;
-	  limit1_exists = true;
+	    && (!exists
+		|| min_max->compare(limit, port_limit))) {
+	  limit = port_limit;
+	  exists = true;
 	}
       }
     }