From 277dee109c3c890e79cfb80b980ce68eb65b2386 Mon Sep 17 00:00:00 2001
From: Tomasz Gorochowik <tgorochowik@antmicro.com>
Date: Wed, 3 Jun 2020 18:50:24 +0200
Subject: [PATCH] Fix Ariane issues with PostAdd nodes (#2400)

---
 src/V3LinkInc.cpp                        | 16 ++++++++--------
 test_regress/t/t_array_index_increment.v |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/V3LinkInc.cpp b/src/V3LinkInc.cpp
index 73dbe7ab5..73fbe604c 100644
--- a/src/V3LinkInc.cpp
+++ b/src/V3LinkInc.cpp
@@ -108,6 +108,14 @@ private:
         // Done the loop
         m_insStmtp = NULL;  // Next thing should be new statement
     }
+    virtual void visit(AstNodeIf* nodep) VL_OVERRIDE {
+        m_insStmtp = nodep;
+        iterateAndNextNull(nodep->condp());
+        m_insStmtp = NULL;
+        iterateAndNextNull(nodep->ifsp());
+        iterateAndNextNull(nodep->elsesp());
+        m_insStmtp = NULL;
+    }
     virtual void visit(AstNodeFor* nodep) VL_OVERRIDE {  // LCOV_EXCL_LINE
         nodep->v3fatalSrc(
             "For statements should have been converted to while statements in V3Begin.cpp");
@@ -122,14 +130,6 @@ private:
         iterateChildren(nodep);
         m_insStmtp = NULL;  // Next thing should be new statement
     }
-    virtual void visit(AstNodeBlock* nodep) VL_OVERRIDE {
-        AstNode* insStmtp_prev = m_insStmtp;
-        {
-            m_insStmtp = NULL;
-            iterateChildren(nodep);
-        }
-        m_insStmtp = insStmtp_prev;
-    }
     void unsupported_visit(AstNode* nodep) {
         m_unsupportedHere = true;
         UINFO(9, "Marking unsupported " << nodep << endl);
diff --git a/test_regress/t/t_array_index_increment.v b/test_regress/t/t_array_index_increment.v
index b306f2122..67732b596 100644
--- a/test_regress/t/t_array_index_increment.v
+++ b/test_regress/t/t_array_index_increment.v
@@ -112,7 +112,10 @@ module t (/*AUTOARG*/
       if (1 == 1) begin
          pos++;
       end
+      if (pos != 1) $stop;
 
+      pos = 0;
+      if (1 == 1) pos++;
       if (pos != 1) $stop;
 
       $write("*-* All Finished *-*\n");