Merge pull request #6450 from The-OpenROAD-Project-staging/ct1

Ct1
The-OpenROAD-Project · Dec 31, 2024 · 2eee4b5 · 2eee4b5
2 parents 21cf29e + 339fe18
commit 2eee4b5
Show file tree

Hide file tree

Showing 66 changed files with 1,378 additions and 2,674 deletions.
diff --git a/src/dpo/src/detailed_manager.cxx b/src/dpo/src/detailed_manager.cxx
@@ -67,7 +67,7 @@ namespace dpo {
 DetailedMgr::DetailedMgr(Architecture* arch,
                          Network* network,
                          RoutingParams* rt)
-    : arch_(arch), network_(network), rt_(rt), disallowOneSiteGaps_(false)
+    : arch_(arch), network_(network), rt_(rt)
 {
   singleRowHeight_ = arch_->getRow(0)->getHeight();
   numSingleHeightRows_ = arch_->getNumRows();

diff --git a/src/dpo/src/detailed_manager.h b/src/dpo/src/detailed_manager.h
@@ -361,7 +361,7 @@ class DetailedMgr
   // Target displacement limits.
   int maxDispX_;
   int maxDispY_;
-  bool disallowOneSiteGaps_;
+  bool disallowOneSiteGaps_{false};
   std::vector<Node*> fixedCells_;  // Fixed; filler, macros, temporary, etc.
 
   // Blockages and segments.

diff --git a/src/drt/src/db/obj/frInst.h b/src/drt/src/db/obj/frInst.h
@@ -46,11 +46,7 @@ class frInst : public frRef
  public:
   // constructors
   frInst(const frString& name, frMaster* master, odb::dbInst* db_inst)
-      : name_(name),
-        master_(master),
-        db_inst_(db_inst),
-        pinAccessIdx_(0),
-        toBeDeleted_(false)
+      : name_(name), master_(master), db_inst_(db_inst)
   {
   }
   // getters
@@ -150,8 +146,8 @@ class frInst : public frRef
   std::vector<std::unique_ptr<frInstBlockage>> instBlockages_;
   odb::dbInst* db_inst_;
   dbTransform xform_;
-  int pinAccessIdx_;
-  bool toBeDeleted_;
+  int pinAccessIdx_{0};
+  bool toBeDeleted_{false};
 };
 
 }  // namespace drt
diff --git a/src/gui/include/gui/gui.h b/src/gui/include/gui/gui.h
@@ -358,7 +358,7 @@ class Selected
 {
  public:
   // Null case
-  Selected() : object_({}), descriptor_(nullptr) {}
+  Selected() = default;
 
   Selected(std::any object, const Descriptor* descriptor)
       : object_(std::move(object)), descriptor_(descriptor)
@@ -430,7 +430,7 @@ class Selected
 
  private:
   std::any object_;
-  const Descriptor* descriptor_;
+  const Descriptor* descriptor_{nullptr};
 };
 
 // This is an interface for classes that wish to be called to render

diff --git a/src/odb/src/db/dbBPin.cpp b/src/odb/src/db/dbBPin.cpp
@@ -70,10 +70,6 @@ _dbBPin::_dbBPin(_dbDatabase*, const _dbBPin& p)
 {
 }
 
-_dbBPin::~_dbBPin()
-{
-}
-
 bool _dbBPin::operator==(const _dbBPin& rhs) const
 {
   if (_flags._status != rhs._flags._status) {

diff --git a/src/odb/src/db/dbBPin.h b/src/odb/src/db/dbBPin.h
@@ -70,7 +70,6 @@ class _dbBPin : public _dbObject
 
   _dbBPin(_dbDatabase*, const _dbBPin& p);
   _dbBPin(_dbDatabase*);
-  ~_dbBPin();
 
   bool operator==(const _dbBPin& rhs) const;
   bool operator!=(const _dbBPin& rhs) const { return !operator==(rhs); }

diff --git a/src/odb/src/db/dbHashTable.h b/src/odb/src/db/dbHashTable.h
@@ -74,7 +74,7 @@ class dbHashTable
 
   dbHashTable();
   dbHashTable(const dbHashTable<T>& table);
-  ~dbHashTable();
+
   bool operator==(const dbHashTable<T>& rhs) const;
   bool operator!=(const dbHashTable<T>& rhs) const { return !operator==(rhs); }
   void differences(dbDiff& diff,

diff --git a/src/odb/src/db/dbHashTable.hpp b/src/odb/src/db/dbHashTable.hpp
@@ -62,11 +62,6 @@ dbHashTable<T>::dbHashTable(const dbHashTable<T>& t)
 {
 }
 
-template <class T>
-dbHashTable<T>::~dbHashTable()
-{
-}
-
 template <class T>
 bool dbHashTable<T>::operator==(const dbHashTable<T>& rhs) const
 {

diff --git a/src/odb/src/db/dbJournal.cpp b/src/odb/src/db/dbJournal.cpp
@@ -46,12 +46,7 @@
 namespace odb {
 
 dbJournal::dbJournal(dbBlock* block)
-    : _block(block),
-      _logger(block->getImpl()->getLogger()),
-      _log(_logger),
-      _start_action(false),
-      _action_idx(0),
-      _cur_action(0)
+    : _block(block), _logger(block->getImpl()->getLogger()), _log(_logger)
 {
 }
 

diff --git a/src/odb/src/db/dbJournal.h b/src/odb/src/db/dbJournal.h
@@ -181,9 +181,9 @@ class dbJournal
   dbBlock* _block;
   utl::Logger* _logger;
   dbJournalLog _log;
-  bool _start_action;
-  uint _action_idx;
-  unsigned char _cur_action;
+  bool _start_action{false};
+  uint _action_idx{0};
+  unsigned char _cur_action{0};
 };
 
 dbIStream& operator>>(dbIStream& stream, dbJournal& jrnl);

diff --git a/src/odb/src/db/dbTarget.h b/src/odb/src/db/dbTarget.h
@@ -64,7 +64,6 @@ class _dbTarget : public _dbObject
 
   _dbTarget(_dbDatabase*, const _dbTarget& t);
   _dbTarget(_dbDatabase*);
-  ~_dbTarget();
 
   bool operator==(const _dbTarget& rhs) const;
   bool operator!=(const _dbTarget& rhs) const { return !operator==(rhs); }
@@ -86,10 +85,6 @@ inline _dbTarget::_dbTarget(_dbDatabase*)
   _flags._spare_bits = 0;
 }
 
-inline _dbTarget::~_dbTarget()
-{
-}
-
 inline dbOStream& operator<<(dbOStream& stream, const _dbTarget& target)
 {
   uint* bit_field = (uint*) &target._flags;

diff --git a/src/odb/src/db/dbTechLayerAntennaRule.cpp b/src/odb/src/db/dbTechLayerAntennaRule.cpp
@@ -411,12 +411,6 @@ dbIStream& operator>>(dbIStream& stream, _ARuleRatio& arrt)
 //
 ////////////////////////////////////////////////////////////////////
 
-_dbTechAntennaAreaElement::_dbTechAntennaAreaElement()
-{
-  _area = -1.0;
-  _lyidx = dbIdValidation::invalidId();
-}
-
 dbOStream& operator<<(dbOStream& stream, const _dbTechLayerAntennaRule& inrule)
 {
   stream << inrule._layer;

diff --git a/src/odb/src/db/dbTechLayerAntennaRule.h b/src/odb/src/db/dbTechLayerAntennaRule.h
@@ -88,12 +88,10 @@ dbIStream& operator>>(dbIStream& stream, _ARuleFactor& arf);
 class _ARuleRatio
 {
  public:
-  double _ratio;
+  double _ratio{0.0};
   dbVector<double> _diff_idx;
   dbVector<double> _diff_ratio;
 
-  _ARuleRatio();
-
   void setRatio(double ratio);
   void setDiff(const std::vector<double>& diff_idx,
                const std::vector<double>& ratios);
@@ -107,10 +105,6 @@ class _ARuleRatio
   void out(dbDiff& diff, char side, const char* field) const;
 };
 
-inline _ARuleRatio::_ARuleRatio() : _ratio(0.0)
-{
-}
-
 dbOStream& operator<<(dbOStream& stream, const _ARuleRatio& arrt);
 dbIStream& operator>>(dbIStream& stream, _ARuleRatio& arrt);
 
@@ -153,7 +147,6 @@ class _dbTechLayerAntennaRule : public _dbObject
   {
   }
 
-  ~_dbTechLayerAntennaRule() {}
   bool operator==(const _dbTechLayerAntennaRule& rhs) const;
   bool operator!=(const _dbTechLayerAntennaRule& rhs) const
   {
@@ -175,8 +168,6 @@ dbIStream& operator>>(dbIStream& stream, _dbTechLayerAntennaRule& inrule);
 class _dbTechAntennaAreaElement
 {
  public:
-  ~_dbTechAntennaAreaElement(){};
-
   static void create(
       dbVector<_dbTechAntennaAreaElement*>& incon,
       double inarea,
@@ -205,9 +196,9 @@ class _dbTechAntennaAreaElement
   dbId<_dbTechLayer> getLayerId() const { return _lyidx; }
 
  private:
-  _dbTechAntennaAreaElement();
-  double _area;
-  dbId<_dbTechLayer> _lyidx;
+  _dbTechAntennaAreaElement() = default;
+  double _area{-1.0};
+  dbId<_dbTechLayer> _lyidx{dbIdValidation::invalidId()};
 };
 
 //

diff --git a/src/odb/src/def/def/defiAlias.cpp b/src/odb/src/def/def/defiAlias.cpp
@@ -42,7 +42,7 @@ class defAliasIterator
 };
 
 defiAlias_itr::defiAlias_itr(defrData* data)
-    : first(1), iterator(nullptr), defData(data ? data : defContext.data)
+    : defData(data ? data : defContext.data)
 {
   defiAlias_itr::Init();
 }

diff --git a/src/odb/src/def/def/defiAlias.hpp b/src/odb/src/def/def/defiAlias.hpp
@@ -52,8 +52,8 @@ class defiAlias_itr
   int Marked();
 
  protected:
-  int first;
-  defAliasIterator* iterator;
+  int first{1};
+  defAliasIterator* iterator{nullptr};
   defrData* defData;
 };
 

diff --git a/src/odb/src/def/def/defiNet.cpp b/src/odb/src/def/def/defiNet.cpp
@@ -767,7 +767,7 @@ const defiPath* defiShield::path(int index) const
 ////////////////////////////////////////////////////
 ////////////////////////////////////////////////////
 
-defiWire::defiWire(defrData* data) : defData(data), paths_(nullptr)
+defiWire::defiWire(defrData* data) : defData(data)
 {
 }
 

diff --git a/src/odb/src/def/def/defiNet.hpp b/src/odb/src/def/def/defiNet.hpp
@@ -73,11 +73,11 @@ class defiWire
 
  protected:
   defrData* defData;
-  defiPath** paths_;
-  char* type_;
-  char* wireShieldName_;  // It only set from specialnet SHIELD, 5.4
-  int numPaths_;
-  long long pathsAllocated_;
+  defiPath** paths_{nullptr};
+  char* type_{nullptr};
+  char* wireShieldName_{nullptr};  // It only set from specialnet SHIELD, 5.4
+  int numPaths_{0};
+  long long pathsAllocated_{0};
 };
 
 class defiSubnet

diff --git a/src/odb/src/def/def/defiPinCap.cpp b/src/odb/src/def/def/defiPinCap.cpp
@@ -80,8 +80,7 @@ void defiPinCap::print(FILE* f) const
 ///////////////////////////////////////////////
 ///////////////////////////////////////////////
 
-defiPinAntennaModel::defiPinAntennaModel(defrData* data)
-    : oxide_(nullptr), defData(data)
+defiPinAntennaModel::defiPinAntennaModel(defrData* data) : defData(data)
 {
   Init();
 }

diff --git a/src/odb/src/def/def/defiPinCap.hpp b/src/odb/src/def/def/defiPinCap.hpp
@@ -99,7 +99,7 @@ class defiPinAntennaModel
   const char* APinMaxCutCarLayer(int index) const;
 
  protected:
-  char* oxide_;
+  char* oxide_{nullptr};
 
   int numAPinGateArea_;  // 5.4
   int APinGateAreaAllocated_;
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,10 +70,6 @@ _dbBPin::_dbBPin(_dbDatabase*, const _dbBPin& p) @@
     {
     }
-    _dbBPin::~_dbBPin()
-    {
-    }
     bool _dbBPin::operator==(const _dbBPin& rhs) const
     {
       if (_flags._status != rhs._flags._status) {
@@ Expand Down @@