Merge pull request #8041 from The-OpenROAD-Project-staging/odb-group-destroy-fix

odb: correctly update insts/modinsts/groups on dbGroup::destroy

Author: maliberty

src/odb/src/db/dbGroup.cpp

@@ -489,17 +489,17 @@ void dbGroup::destroy(dbGroup* group)
 {
   _dbGroup* _group = (_dbGroup*) group;
   _dbBlock* block = (_dbBlock*) _group->getOwner();
-  for (auto inst : group->getInsts()) {
-    group->removeInst(inst);
+  while (!group->getInsts().empty()) {
+    group->removeInst(*group->getInsts().begin());
   }
   if (_group->region_.isValid()) {
     group->getRegion()->removeGroup(group);
   }
-  for (auto modinst : group->getModInsts()) {
-    group->removeModInst(modinst);
+  while (!group->getModInsts().empty()) {
+    group->removeModInst(*group->getModInsts().begin());
   }
-  for (auto child : group->getGroups()) {
-    group->removeGroup(child);
+  while (!group->getGroups().empty()) {
+    group->removeGroup(*group->getGroups().begin());
   }
   if (_group->_parent_group.isValid()) {
     group->getParentGroup()->removeGroup(group);

src/odb/test/test_group.tcl

@@ -57,6 +57,29 @@ proc test_default { } {
   tearDown $db
 }
 
+proc test_destroy { } {
+  # Setup
+  lassign [createSimpleDB] db lib
+  set block [create1LevelBlock $db $lib [$db getChip]]
+  set and2 [$lib findMaster "and2"]
+
+  set inst1 [odb::dbInst_create $block $and2 "inst1"]
+  set inst2 [odb::dbInst_create $block $and2 "inst2"]
+
+  set group [odb::dbGroup_create $block "group"]
+  $group addInst $inst1
+  $group addInst $inst2
+
+  # Test action
+  odb::dbGroup_destroy $group
+
+  # Verification
+  assertStringEq [$inst1 getGroup] "NULL"
+  assertStringEq [$inst2 getGroup] "NULL"
+  tearDown $db
+}
+
 test_default
+test_destroy
 puts "pass"
 exit 0