Fixed incomplete master merge.

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

Author: jhkim-pii

src/dbSta/src/dbEditHierarchy.cc

@@ -409,8 +409,9 @@ void dbEditHierarchy::hierarchicalConnect(dbITerm* source_pin,
         }
 
         // Create and connect dbModNet
-        source_db_mod_net = dbModNet::create(lowest_common_module, base_name);
-        top_mod_dest->connect(source_db_mod_net);
+        source_db_mod_net
+            = dbModNet::create(lowest_common_module, unique_name.c_str());
+        top_dest_mod_iterm->connect(source_db_mod_net);
         db_network_->disconnectPin(sta_source_pin);
         db_network_->connectPin(sta_source_pin,
                                 (Net*) source_pin_flat_net,

src/dbSta/src/dbEditHierarchy.hh

@@ -43,7 +43,7 @@ class dbEditHierarchy
                           std::vector<dbModule*>& parent_hierarchy) const;
   dbModule* findLowestCommonModule(std::vector<dbModule*>& itree1,
                                    std::vector<dbModule*>& itree2) const;
-  bool ConnectionToModuleExists(dbITerm* source_pin,
+  bool connectionToModuleExists(dbITerm* source_pin,
                                 dbModule* dest_module,
                                 dbModBTerm*& dest_modbterm,
                                 dbModITerm*& dest_moditerm) const;
@@ -56,7 +56,7 @@ class dbEditHierarchy
 
  private:
   void createHierarchyBottomUp(Pin* pin,
-                               dbModule* highest_common_module,
+                               dbModule* lowest_common_module,
                                const dbIoType& io_type,
                                const char* connection_name,
                                dbModNet*& top_mod_net,
@@ -83,13 +83,13 @@ class dbEditHierarchy
   void dlogHierConnReusingConnection(dbModule* dest_db_module,
                                      dbModNet* dest_mod_net) const;
   void dlogHierConnCreatingSrcHierarchy(dbITerm* source_pin,
-                                        dbModule* highest_common_module) const;
+                                        dbModule* lowest_common_module) const;
   void dlogHierConnCreatingDstHierarchy(Pin* dest_pin,
-                                        dbModule* highest_common_module) const;
+                                        dbModule* lowest_common_module) const;
   void dlogHierConnConnectingInCommon(const char* connection_name,
-                                      dbModule* highest_common_module) const;
+                                      dbModule* lowest_common_module) const;
   void dlogHierConnCreatingTopNet(const char* connection_name,
-                                  dbModule* highest_common_module) const;
+                                  dbModule* lowest_common_module) const;
   void dlogHierConnConnectingTopDstPin(dbModITerm* top_mod_dest,
                                        dbModNet* net) const;
   void dlogHierConnConnectingDstPin(dbITerm* dest_pin, dbModNet* top_net) const;