From e3a1954e206825931734fd21cfe8b8132fedef4c Mon Sep 17 00:00:00 2001
From: James Pallister <james@jpallister.com>
Date: Sun, 27 Sep 2020 15:10:44 +0100
Subject: [PATCH] Fix hierarchical references used inside a function (#2267)
 (#2572)

---
 docs/CONTRIBUTORS             |  1 +
 src/V3Begin.cpp               |  2 +-
 test_regress/t/t_hier_task.pl | 21 +++++++++++++++
 test_regress/t/t_hier_task.v  | 48 +++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100755 test_regress/t/t_hier_task.pl
 create mode 100644 test_regress/t/t_hier_task.v

diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS
index fca9bec6d..9bba8c7d1 100644
--- a/docs/CONTRIBUTORS
+++ b/docs/CONTRIBUTORS
@@ -25,6 +25,7 @@ Iztok Jeras
 James Hanlon
 James Hutchinson
 Jamey Hicks
+James Pallister
 Jan Van Winkel
 Jeremy Bennett
 John Coiner
diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp
index f5a7668ec..262054805 100644
--- a/src/V3Begin.cpp
+++ b/src/V3Begin.cpp
@@ -203,7 +203,7 @@ private:
     }
     virtual void visit(AstVarXRef* nodep) override {
         UINFO(9, "   VARXREF " << nodep << endl);
-        if (m_namedScope != "" && nodep->inlinedDots() == "") {
+        if (m_namedScope != "" && nodep->inlinedDots() == "" && !m_ftaskp) {
             nodep->inlinedDots(m_namedScope);
             UINFO(9, "    rescope to " << nodep << endl);
         }
diff --git a/test_regress/t/t_hier_task.pl b/test_regress/t/t_hier_task.pl
new file mode 100755
index 000000000..b46d46042
--- /dev/null
+++ b/test_regress/t/t_hier_task.pl
@@ -0,0 +1,21 @@
+#!/usr/bin/env perl
+if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003 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
+
+scenarios(simulator => 1);
+
+compile(
+    );
+
+execute(
+    check_finished => 1,
+    );
+
+ok(1);
+1;
diff --git a/test_regress/t/t_hier_task.v b/test_regress/t/t_hier_task.v
new file mode 100644
index 000000000..dfd3f7948
--- /dev/null
+++ b/test_regress/t/t_hier_task.v
@@ -0,0 +1,48 @@
+// DESCRIPTION: Verilator: Test for issue #2267
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2020 by James Pallister.
+// SPDX-License-Identifier: CC0-1.0
+
+module mod_a;
+   mod_inner u_inner;
+   mod_a_mon u_a_mon;
+
+   initial begin
+      bit x;
+
+      u_inner.x = 1;
+      u_a_mon.y = 0;
+      u_a_mon.accessor;
+
+      if (u_a_mon.y != 1) begin
+         $write("%%Error: Incorrect value placed in submodule\n");
+         $stop;
+      end
+
+      u_inner.x = 0;
+      u_a_mon.accessor;
+
+      if (u_a_mon.y != 0) begin
+         $write("%%Error: Incorrect value placed in submodule\n");
+         $stop;
+      end
+
+      $write("*-* All Finished *-*\n");
+      $finish;
+   end
+endmodule : mod_a
+
+module mod_inner;
+   logic x;
+endmodule : mod_inner
+
+module mod_a_mon;
+   bit y;
+   function void accessor;
+      begin : accessor_block
+         bit read_x = mod_a.u_inner.x;
+         y = read_x;
+      end
+   endfunction
+endmodule