Merge branch 'parallaxsw:master' into main

Silimate · Nov 14, 2024 · d8d18e3 · d8d18e3
2 parents cdf0698 + e56d0e2
commit d8d18e3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/dcalc/FindRoot.cc b/dcalc/FindRoot.cc
@@ -16,7 +16,7 @@
 
 #include "FindRoot.hh"
 
-#include <algorithm> // abs
+#include <cmath> // abs
 
 namespace sta {
 

diff --git a/doc/OpenSTA.odt b/doc/OpenSTA.odt
diff --git a/doc/OpenSTA.pdf b/doc/OpenSTA.pdf
diff --git a/search/Tag.cc b/search/Tag.cc
@@ -607,7 +607,7 @@ tagStateEqual(ExceptionStateSet *states1,
     return false;
 }
 
-// Match false, loop exception states only for crpr min/max paths.
+// Match loop exception states only for crpr min/max paths.
 static bool
 tagStateEqualCrpr(const Tag *tag1,
 		  const Tag *tag2)
@@ -622,8 +622,7 @@ tagStateEqualCrpr(const Tag *tag1,
     while (state_iter1.hasNext()) {
       state1 = state_iter1.next();
       ExceptionPath *exception1 = state1->exception();
-      if (exception1->isFalse()
-	  || exception1->isLoop())
+      if (exception1->isLoop())
 	break;
       else
 	state1 = nullptr;
@@ -632,8 +631,7 @@ tagStateEqualCrpr(const Tag *tag1,
     while (state_iter2.hasNext()) {
       state2 = state_iter2.next();
       ExceptionPath *exception2 = state2->exception();
-      if (exception2->isFalse()
-	  || exception2->isLoop())
+      if (exception2->isLoop())
 	break;
       else
 	state2 = nullptr;

diff --git a/util/StringUtil.cc b/util/StringUtil.cc
@@ -19,6 +19,7 @@
 #include <limits>
 #include <cctype>
 #include <cstdio>
+#include <cstdlib> // exit
 #include <array>
 #include <algorithm>