From: Gabe Black <gabeblack@google.com>
Date: Thu, 23 Aug 2018 04:54:19 +0000 (-0700)
Subject: systemc: Handle null sc_object names.
X-Git-Tag: v19.0.0.0~1734
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5a4407b3b693ca22a80f4aa1359c6ccf3f27f694;p=gem5.git

systemc: Handle null sc_object names.

A null pointer for an sc_object name is supposed to be equivalent to
an empty string.

Change-Id: I6094577ad43f13d47a20bc67fa15f4c04d448fe5
Reviewed-on: https://gem5-review.googlesource.com/12257
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/systemc/core/object.cc b/src/systemc/core/object.cc
index e066a239f..1fb1d4591 100644
--- a/src/systemc/core/object.cc
+++ b/src/systemc/core/object.cc
@@ -72,7 +72,7 @@ popObject(Objects *objects, const std::string &name)
 Object::Object(sc_core::sc_object *_sc_obj) : Object(_sc_obj, "object") {}
 
 Object::Object(sc_core::sc_object *_sc_obj, const char *obj_name) :
-    _sc_obj(_sc_obj), _basename(obj_name), parent(nullptr)
+    _sc_obj(_sc_obj), _basename(obj_name ? obj_name : ""), parent(nullptr)
 {
     if (_basename == "")
         _basename = "object";