From aebb54444e6076d1745acf96e57118f7fd048b5c Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sun, 29 Nov 2020 09:50:30 -0500
Subject: [PATCH] Internals: Favor NodeProcedure. No functional change
 intended.

---
 src/V3Clock.cpp | 11 +----------
 src/V3Gate.cpp  |  7 ++-----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp
index ecb1f939b..31128c4f7 100644
--- a/src/V3Clock.cpp
+++ b/src/V3Clock.cpp
@@ -293,7 +293,7 @@ private:
         }
         m_scopep = nullptr;
     }
-    virtual void visit(AstAlways* nodep) override {
+    virtual void visit(AstNodeProcedure* nodep) override {
         AstNode* cmtp = new AstComment(nodep->fileline(), nodep->typeName(), true);
         nodep->replaceWith(cmtp);
         if (AstNode* stmtsp = nodep->bodysp()) {
@@ -328,15 +328,6 @@ private:
         nodep->replaceWith(newp);
         VL_DO_DANGLING(nodep->deleteTree(), nodep);
     }
-    virtual void visit(AstInitial* nodep) override {
-        AstNode* cmtp = new AstComment(nodep->fileline(), nodep->typeName(), true);
-        nodep->replaceWith(cmtp);
-        if (AstNode* stmtsp = nodep->bodysp()) {
-            stmtsp->unlinkFrBackWithNext();
-            cmtp->addNextHere(stmtsp);
-        }
-        VL_DO_DANGLING(nodep->deleteTree(), nodep);
-    }
     virtual void visit(AstCFunc* nodep) override {
         iterateChildren(nodep);
         // Link to global function
diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp
index 7049a14a4..c14bb648d 100644
--- a/src/V3Gate.cpp
+++ b/src/V3Gate.cpp
@@ -467,9 +467,6 @@ private:
             }
         }
     }
-    virtual void visit(AstAlways* nodep) override {
-        iterateNewStmt(nodep, (nodep->isJustOneBodyStmt() ? nullptr : "Multiple Stmts"), nullptr);
-    }
     virtual void visit(AstAlwaysPublic* nodep) override {
         VL_RESTORER(m_inSlow);
         {
@@ -489,10 +486,10 @@ private:
         }
         m_inSenItem = false;
     }
-    virtual void visit(AstInitial* nodep) override {
+    virtual void visit(AstNodeProcedure* nodep) override {
         VL_RESTORER(m_inSlow);
         {
-            m_inSlow = true;
+            m_inSlow = VN_IS(nodep, Initial) || VN_IS(nodep, Final);
             iterateNewStmt(nodep, (nodep->isJustOneBodyStmt() ? nullptr : "Multiple Stmts"),
                            nullptr);
         }