Serializer: always Purge() on deconstruct.

Signed-off-by: Henner Zeller <h.zeller@acm.org>
chipsalliance · Jun 11, 2022 · 685e13b · 685e13b
1 parent 79ecd7a
commit 685e13b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/templates/Serializer.cpp b/templates/Serializer.cpp
@@ -81,6 +81,10 @@ std::map<std::string, unsigned long> Serializer::ObjectStats() const {
   return stats;
 }
 
+Serializer::~Serializer() {
+  Purge();
+}
+
 void Serializer::Purge() {
   allIds_.clear();
   anyVectMaker.Purge();

diff --git a/templates/Serializer.h b/templates/Serializer.h
@@ -79,6 +79,8 @@ class Serializer {
   Serializer() : incrId_(0), objId_(0), errorHandler(DefaultErrorHandler) {
     symbolMaker.Make("");
   }
+  ~Serializer();
+
   void Save(const std::string& file);
   void Purge();
   void SetErrorHandler(ErrorHandler handler) { errorHandler = handler; }

diff --git a/tests/garbage_collect_test.cpp b/tests/garbage_collect_test.cpp
@@ -65,5 +65,4 @@ TEST(GarbageCollectTest, NoLeakExpectation) {
   for (vpiHandle design : restoredDesigns) {
     vpi_release_handle(design);
   }
-  serializer.Purge();
 }