From 3ae18af8ddd4f3d239ac970fde6a9626ca566faf Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 24 Sep 2024 20:24:27 -0400
Subject: [PATCH] Fix short-circuting on method calls (#5486).

---
 Changes                                      |  1 +
 src/V3AstNodes.cpp                           |  9 ++++++
 test_regress/t/t_a7_hier_block_cmake.py      |  8 +++--
 test_regress/t/t_math_shortcircuit_dynsel.py | 18 +++++++++++
 test_regress/t/t_math_shortcircuit_dynsel.v  | 32 ++++++++++++++++++++
 5 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100755 test_regress/t/t_math_shortcircuit_dynsel.py
 create mode 100644 test_regress/t/t_math_shortcircuit_dynsel.v

diff --git a/Changes b/Changes
index 19f7008bf..986303b49 100644
--- a/Changes
+++ b/Changes
@@ -64,6 +64,7 @@ Verilator 5.029 devel
 * Fix --binary with .cpp PLI filenames under relative directory paths.
 * Fix extra dot in coverage point hierarchy when using name()=''.
 * Fix short-circuting with associative array access (#5484). [Ethan Sifferman]
+* Fix short-circuting on method calls (#5486). [Ethan Sifferman]
 
 
 Verilator 5.028 2024-08-21
diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp
index df592fe49..5b66bef45 100644
--- a/src/V3AstNodes.cpp
+++ b/src/V3AstNodes.cpp
@@ -2896,6 +2896,15 @@ void AstCMethodHard::setPurity() {
     auto isPureIt = isPureMethod.find(name());
     UASSERT_OBJ(isPureIt != isPureMethod.end(), this, "Unknown purity of method " + name());
     m_pure = isPureIt->second;
+    if (!m_pure) return;
+    if (!fromp()->isPure()) m_pure = false;
+    if (!m_pure) return;
+    for (AstNodeExpr* argp = pinsp(); argp; argp = VN_AS(argp->nextp(), NodeExpr)) {
+        if (!argp->isPure()) {
+            m_pure = false;
+            return;
+        }
+    }
 }
 
 void AstCUse::dump(std::ostream& str) const {
diff --git a/test_regress/t/t_a7_hier_block_cmake.py b/test_regress/t/t_a7_hier_block_cmake.py
index dcc940045..30902408b 100755
--- a/test_regress/t/t_a7_hier_block_cmake.py
+++ b/test_regress/t/t_a7_hier_block_cmake.py
@@ -26,9 +26,11 @@ test.run(logfile=test.obj_dir + "/cmake.log",
              "-DCMAKE_PREFIX_PATH=" + os.environ["VERILATOR_ROOT"], threads
          ])
 
-test.run(
-    logfile=test.obj_dir + "/build.log",
-    cmd=['cd "' + test.obj_dir + '" && cmake --build', '.', '--', "CXX_FLAGS=" + str(threads)])
+test.run(logfile=test.obj_dir + "/build.log",
+         cmd=[
+             'cd "' + test.obj_dir + '" && cmake --build', '.', ('-v' if test.verbose else ''),
+             '--', "CXX_FLAGS=" + str(threads)
+         ])
 
 test.run(logfile=test.obj_dir + "/run.log",
          cmd=['cd "' + test.obj_dir + '" && ./t_hier_block_cmake', '.'])
diff --git a/test_regress/t/t_math_shortcircuit_dynsel.py b/test_regress/t/t_math_shortcircuit_dynsel.py
new file mode 100755
index 000000000..d4f986441
--- /dev/null
+++ b/test_regress/t/t_math_shortcircuit_dynsel.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2024 by Wilson Snyder. This program is free software; you
+# can redistribute it and/or modify it under the terms of either the GNU
+# Lesser General Public License Version 3 or the Perl Artistic License
+# Version 2.0.
+# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
+
+import vltest_bootstrap
+
+test.scenarios('simulator')
+
+test.compile()
+
+test.execute()
+
+test.passes()
diff --git a/test_regress/t/t_math_shortcircuit_dynsel.v b/test_regress/t/t_math_shortcircuit_dynsel.v
new file mode 100644
index 000000000..52b4bf995
--- /dev/null
+++ b/test_regress/t/t_math_shortcircuit_dynsel.v
@@ -0,0 +1,32 @@
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed under the Creative Commons Public Domain, for
+// any use, without warranty, 2024 by Wilson Snyder.
+// SPDX-License-Identifier: CC0-1.0
+
+module t;
+   logic [31:0] dict [int] [];
+   // verilator lint_off WIDTHTRUNC
+   function automatic logic f(int a);
+      int dict_size = dict.size;
+      logic next_exists = dict.next(a);
+      // incorrectly inserts element at `a`
+      logic next_nonzero = !next_exists || (dict[a].size != 0);
+      if (dict_size != dict.size) begin
+         $display("Assertion failed: dict_size mismatch");
+         $display("Initial size: %0d, New size: %0d", dict_size, dict.size);
+         $display("Dictionary contents:");
+         foreach (dict[key]) begin
+            $display(" Key: %0d, Value: %0d", key, dict[key]);
+         end
+         $error;
+      end
+      return next_nonzero;
+   endfunction
+   initial begin
+      logic r = f(0);
+      $display(r);
+      $write("*-* All Finished *-*\n");
+      $finish;
+   end
+endmodule