Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43012 )
Change subject: base-stats: Fix null addStatGroup
......................................................................
base-stats: Fix null addStatGroup
A group must be provided to be added to a stat
group.
Change-Id: I9da42fb12c2a8b258f9f45922a6fb6b7fd41a698
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/base/stats/group.cc
M src/base/stats/group.test.cc
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/base/stats/group.cc b/src/base/stats/group.cc
index 9e50c45..8f1f08f 100644
--- a/src/base/stats/group.cc
+++ b/src/base/stats/group.cc
@@ -110,6 +110,7 @@
void
Group::addStatGroup(const char *name, Group *block)
{
+ panic_if(!block, "Can't add null stat group %s", name);
panic_if(block == this, "Stat group can't be added to itself");
panic_if(statGroups.find(name) != statGroups.end(),
"Stats of the same group share the same name `%s`.\n", name);
diff --git a/src/base/stats/group.test.cc b/src/base/stats/group.test.cc
index 23e9a3b..40aa66c 100644
--- a/src/base/stats/group.test.cc
+++ b/src/base/stats/group.test.cc
@@ -77,7 +77,7 @@
}
/** Test that a group cannot add a non-existent group. */
-TEST(StatsGroupDeathTest, DISABLED_AddNull)
+TEST(StatsGroupDeathTest, AddNull)
{
Stats::Group root(nullptr);
ASSERT_ANY_THROW(root.addStatGroup("Node1", nullptr));
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43012
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I9da42fb12c2a8b258f9f45922a6fb6b7fd41a698
Gerrit-Change-Number: 43012
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
