Merge pull request #7203 from andyfox-rushc/master

Delete module inst after moditerms

Author: maliberty

src/odb/src/db/dbModInst.cpp

@@ -237,16 +237,6 @@ void dbModInst::destroy(dbModInst* modinst)
 
   _dbModule* _master = (_dbModule*) modinst->getMaster();
 
-  if (_block->_journal) {
-    _block->_journal->beginAction(dbJournal::DELETE_OBJECT);
-    _block->_journal->pushParam(dbModInstObj);
-    _block->_journal->pushParam(modinst->getName());
-    _block->_journal->pushParam(modinst->getId());
-    _block->_journal->pushParam(_module->getId());
-    _block->_journal->pushParam(_master->getId());
-    _block->_journal->endAction();
-  }
-
   _master->_mod_inst = dbId<_dbModInst>();  // clear
 
   // Note that we only destroy the module instance, not the module
@@ -256,6 +246,8 @@ void dbModInst::destroy(dbModInst* modinst)
   dbSet<dbModITerm>::iterator moditerm_itr;
   for (moditerm_itr = moditerms.begin(); moditerm_itr != moditerms.end();) {
     dbModITerm* moditerm = *moditerm_itr;
+    // pins disconnected before deletion, so we restore pin before
+    // trying to connect on journalling restore of modInst.
     moditerm->disconnect();
     moditerm_itr = dbModITerm::destroy(moditerm_itr);
   }
@@ -283,6 +275,18 @@ void dbModInst::destroy(dbModInst* modinst)
   }
 
   dbProperty::destroyProperties(_modinst);
+
+  // Assure that dbModInst obj is restored first by being journalled last.
+  if (_block->_journal) {
+    _block->_journal->beginAction(dbJournal::DELETE_OBJECT);
+    _block->_journal->pushParam(dbModInstObj);
+    _block->_journal->pushParam(modinst->getName());
+    _block->_journal->pushParam(modinst->getId());
+    _block->_journal->pushParam(_module->getId());
+    _block->_journal->pushParam(_master->getId());
+    _block->_journal->endAction();
+  }
+
   _dbModule* _parent = (_dbModule*) (modinst->getParent());
   _parent->_modinst_hash.erase(modinst->getName());
   _block->_modinst_tbl->destroy(_modinst);

src/odb/src/db/dbModule.cpp

@@ -419,18 +419,23 @@ void dbModule::destroy(dbModule* module)
     inst_itr = dbInst::destroy(inst_itr);
   }
 
+  dbSet<dbModNet> modnets = module->getModNets();
+  dbSet<dbModNet>::iterator modnet_itr;
+  for (modnet_itr = modnets.begin(); modnet_itr != modnets.end();) {
+    modnet_itr = dbModNet::destroy(modnet_itr);
+  }
+
   dbSet<dbModBTerm> modbterms = module->getModBTerms();
   dbSet<dbModBTerm>::iterator modbterm_itr;
   for (modbterm_itr = modbterms.begin(); modbterm_itr != modbterms.end();) {
     modbterm_itr = dbModBTerm::destroy(modbterm_itr);
   }
 
-  dbSet<dbModNet> modnets = module->getModNets();
-  dbSet<dbModNet>::iterator modnet_itr;
-  for (modnet_itr = modnets.begin(); modnet_itr != modnets.end();) {
-    modnet_itr = dbModNet::destroy(modnet_itr);
-  }
+  dbProperty::destroyProperties(_module);
 
+  // Journal the deletion of the dbModule after its ports
+  // and properties deleted, so that on restore we have
+  // dbModule to hang objects on.
   if (block->_journal) {
     block->_journal->beginAction(dbJournal::DELETE_OBJECT);
     block->_journal->pushParam(dbModuleObj);
@@ -439,7 +444,6 @@ void dbModule::destroy(dbModule* module)
     block->_journal->endAction();
   }
 
-  dbProperty::destroyProperties(_module);
   block->_module_hash.remove(_module);
   block->_module_tbl->destroy(_module);
 }