From bc46b4ac03849706c32a8d6a3383d56373983eab Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 19 Jul 2018 17:12:31 -0700 Subject: [PATCH] systemc: Make orphans top level objects instead of panic-ing. When a simulation ends, the sc_objects it contains are destroyed one by one, not necessarily in hierarchy order. That means that a parent object can legitimately be destroyed before its children. Instead of panic-ing when that inevitably happens, this change makes gem5 turn those children into top level objects. Change-Id: Icad9c99310fbc3ddcadbbb4f8a990b4fbfe35bdf Reviewed-on: https://gem5-review.googlesource.com/12035 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/object.cc | 7 ++++++- src/systemc/core/object.hh | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/systemc/core/object.cc b/src/systemc/core/object.cc index 68c52eb06..39403ca34 100644 --- a/src/systemc/core/object.cc +++ b/src/systemc/core/object.cc @@ -118,7 +118,12 @@ Object::operator = (const Object &) Object::~Object() { - panic_if(!children.empty(), "Parent object still has children.\n"); + // Promote all children to be top level objects. + for (auto child: children) { + addObject(&topLevelObjects, child); + child->_gem5_object->parent = nullptr; + } + children.clear(); if (parent) popObject(&parent->_gem5_object->children, _name); diff --git a/src/systemc/core/object.hh b/src/systemc/core/object.hh index 1317986bc..c87a98b2d 100644 --- a/src/systemc/core/object.hh +++ b/src/systemc/core/object.hh @@ -99,7 +99,6 @@ class Object Objects children; Events events; sc_core::sc_object *parent; - ObjectsIt parentIt; sc_core::sc_attr_cltn cltn; }; -- 2.30.2