odb: Refactored based on review feedback

Signed-off-by: Jaehyun Kim <[email protected]>

Author: jhkim-pii

src/odb/include/odb/db.h

@@ -1844,13 +1844,7 @@ class dbNet : public dbObject
   ///
   /// Set the driving term id assigned of this net.
   ///
-  void setDrivingITerm(int id);
-
-  ///
-  /// Returns driving term id assigned of this net. -1 if not set, 0 if non
-  /// existent
-  ///
-  int getDrivingITermId() const;
+  void setDrivingITerm(const dbITerm* iterm);
 
   ///
   /// Returns the driving dbITerm* of this net.

src/odb/src/db/dbBlock.cpp

@@ -3330,11 +3330,11 @@ void dbBlock::setDrivingItermsforNets()
       continue;
     }
 
-    net->setDrivingITerm(0);
+    net->setDrivingITerm(nullptr);
 
     for (dbITerm* tr : net->getITerms()) {
       if (tr->getIoType() == dbIoType::OUTPUT) {
-        net->setDrivingITerm(tr->getId());
+        net->setDrivingITerm(tr);
         break;
       }
     }

src/odb/src/db/dbInsertBuffer.cpp

@@ -185,7 +185,6 @@ dbInst* dbInsertBuffer::insertBufferBeforeLoads(
   if (buffer_inst == nullptr) {
     logger_->error(
         utl::ODB, 1205, "BeforeLoads: Failed to create buffer instance.");
-    return nullptr;
   }
 
   // 3. Create Buffer Net
@@ -284,8 +283,8 @@ dbInst* dbInsertBuffer::checkAndCreateBuffer()
                                        uniquify_,
                                        target_module_);
 
-  buf_input_iterm_ = buffer_inst->findITerm(input_mterm->getConstName());
-  buf_output_iterm_ = buffer_inst->findITerm(output_mterm->getConstName());
+  buf_input_iterm_ = buffer_inst->getITerm(input_mterm);
+  buf_output_iterm_ = buffer_inst->getITerm(output_mterm);
 
   return buffer_inst;
 }
@@ -309,15 +308,19 @@ void dbInsertBuffer::placeNewBuffer(dbInst* buffer_inst,
 {
   int x = 0;
   int y = 0;
+  bool placed = false;
   if (loc) {
     x = loc->getX();
     y = loc->getY();
+    placed = true;
   } else {
-    getPinLocation(term, x, y);
+    placed = getPinLocation(term, x, y);
   }
 
-  buffer_inst->setLocation(x, y);
-  buffer_inst->setPlacementStatus(dbPlacementStatus::PLACED);
+  if (placed) {
+    buffer_inst->setLocation(x, y);
+    buffer_inst->setPlacementStatus(dbPlacementStatus::PLACED);
+  }
 }
 
 void dbInsertBuffer::rewireBufferSimple(bool insertBefore,

src/odb/src/db/dbNet.cpp

@@ -534,16 +534,10 @@ void dbNet::setCcAdjustOrder(uint32_t order)
   net->cc_adjust_order_ = order;
 }
 
-void dbNet::setDrivingITerm(int id)
+void dbNet::setDrivingITerm(const dbITerm* iterm)
 {
   _dbNet* net = (_dbNet*) this;
-  net->driving_iterm_ = id;
-}
-
-int dbNet::getDrivingITermId() const
-{
-  _dbNet* net = (_dbNet*) this;
-  return net->driving_iterm_;
+  net->driving_iterm_ = (iterm) ? iterm->getId() : 0;
 }
 
 dbITerm* dbNet::getDrivingITerm() const
@@ -1246,9 +1240,8 @@ dbObject* dbNet::getFirstDriverTerm() const
 
 dbITerm* dbNet::getFirstOutput() const
 {
-  if (getDrivingITermId() > 0) {
-    return dbITerm::getITerm((dbBlock*) getImpl()->getOwner(),
-                             getDrivingITermId());
+  if (dbITerm* drvrIterm = getDrivingITerm()) {
+    return drvrIterm;
   }
 
   for (dbITerm* tr : getITerms()) {