From: Gabe Black <gabeblack@google.com>
Date: Mon, 25 Sep 2017 23:17:24 +0000 (-0700)
Subject: sim: Don't add the NULL SimObject as a child of other SimObjects.
X-Git-Tag: v19.0.0.0~2620
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=765c0bb6b3d771f3a9997ff772c9e03525e3bee1;p=gem5.git

sim: Don't add the NULL SimObject as a child of other SimObjects.

Change-Id: Ibdc48af8e5a461077f75d781cfd8191586c54115
Reviewed-on: https://gem5-review.googlesource.com/4846
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index baeef73d9..cff818c66 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -579,7 +579,8 @@ class MetaSimObject(type):
         # object is not an orphan and can provide better error
         # messages.
         child.set_parent(cls, name)
-        cls._children[name] = child
+        if not isNullPointer(child):
+            cls._children[name] = child
 
     def _new_port(cls, name, port):
         # each port should be uniquely assigned to one variable
@@ -1226,7 +1227,8 @@ class SimObject(object):
             # exercised without specialized testing.
             self.clear_child(name)
         child.set_parent(self, name)
-        self._children[name] = child
+        if not isNullPointer(child):
+            self._children[name] = child
 
     # Take SimObject-valued parameters that haven't been explicitly
     # assigned as children and make them children of the object that