Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13302 )
Change subject: systemc: Add an error check to sc_gen_unique_name.
......................................................................
systemc: Add an error check to sc_gen_unique_name.
Accellera checks for a null pointer, and a test tries using that input.
Change-Id: I0f098f53de37ebbe481ea46e61fc0a9a404c29db
Reviewed-on: https://gem5-review.googlesource.com/c/13302
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/core/sc_module.cc
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/core/sc_module.cc b/src/systemc/core/sc_module.cc
index 175b9db..0b58f32 100644
--- a/src/systemc/core/sc_module.cc
+++ b/src/systemc/core/sc_module.cc
@@ -822,12 +822,20 @@
const char *
sc_gen_unique_name(const char *seed)
{
+ if (!seed || seed[0] == '\0') {
+ SC_REPORT_ERROR(
+ "(E532) cannot generate unique name from null string", "");
+ seed = "unnamed";
+ }
+
auto mod = sc_gem5::pickParentModule();
if (mod)
return mod->uniqueName(seed);
+
sc_gem5::Process *p = sc_gem5::scheduler.current();
if (p)
return p->uniqueName(seed);
+
return ::sc_gem5::nameGen.gen(seed);
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13302
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I0f098f53de37ebbe481ea46e61fc0a9a404c29db
Gerrit-Change-Number: 13302
Gerrit-PatchSet: 4
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
