Add VL_RESTORER, cleanup and format

Signed-off-by: Krzysztof Boronski <[email protected]>
antmicro · Oct 27, 2023 · 32ac316 · 32ac316
1 parent c33891a
commit 32ac316
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/V3Fork.cpp b/src/V3Fork.cpp
@@ -43,9 +43,7 @@
 #include "V3Fork.h"
 
 #include "V3AstNodeExpr.h"
-#include "V3Global.h"
 #include "V3MemberMap.h"
-#include "V3String.h"
 
 #include <set>
 #include <vector>
@@ -82,8 +80,7 @@ class ForkDynScopeFrame final {
     ForkDynScopeInstance& createInstancePrototype() {
         UASSERT_OBJ(!m_instance.initialized(), m_procp, "Dynamic scope already instantiated.");
 
-        m_instance.m_classp
-            = new AstClass{m_procp->fileline(), generateDynScopeClassName()};
+        m_instance.m_classp = new AstClass{m_procp->fileline(), generateDynScopeClassName()};
         m_instance.m_refDTypep
             = new AstClassRefDType{m_procp->fileline(), m_instance.m_classp, nullptr};
         v3Global.rootp()->typeTablep()->addTypesp(m_instance.m_refDTypep);
@@ -229,9 +226,7 @@ class ForkDynScopeFrame final {
         m_modp->addStmtsp(m_instance.m_classp);
     }
 
-    string generateDynScopeClassName() {
-        return "__VDynScope_" + cvtToStr(m_class_id);
-    }
+    string generateDynScopeClassName() { return "__VDynScope_" + cvtToStr(m_class_id); }
 
     string generateDynScopeHandleName(const AstNode* fromp) {
         return "__VDynScope_" + (!fromp->name().empty() ? (fromp->name() + "_") : "ANON_")
@@ -624,6 +619,7 @@ class ForkVisitor final : public VNVisitor {
     void visit(AstThisRef* nodep) override { return; }
     void visit(AstNodeModule* nodep) override {
         VL_RESTORER(m_modp);
+        VL_RESTORER(m_id);
         m_modp = nodep;
         m_id = 0;
         iterateChildren(nodep);