From ee25114a0070ff575c49c9f195bdbcb50d276214 Mon Sep 17 00:00:00 2001
From: Todd Strader <todd.strader@gmail.com>
Date: Fri, 26 Mar 2021 18:27:38 -0400
Subject: [PATCH] interface localparam access (#2859)

---
 src/V3SymTable.h                              |  2 +-
 test_regress/t/t_interface_parameter_access.v | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/V3SymTable.h b/src/V3SymTable.h
index 12c1e1ba3..085b25e71 100644
--- a/src/V3SymTable.h
+++ b/src/V3SymTable.h
@@ -249,7 +249,7 @@ public:
             const string& name = it->first;
             VSymEnt* subSrcp = it->second;
             const AstVar* varp = VN_CAST(subSrcp->nodep(), Var);
-            if (!onlyUnmodportable || (varp && varp->varType() == AstVarType::GPARAM)) {
+            if (!onlyUnmodportable || (varp && varp->isParam())) {
                 VSymEnt* subSymp = new VSymEnt(graphp, subSrcp);
                 reinsert(name, subSymp);
                 // And recurse to create children
diff --git a/test_regress/t/t_interface_parameter_access.v b/test_regress/t/t_interface_parameter_access.v
index 3912fd2ff..4bdd8c6ec 100644
--- a/test_regress/t/t_interface_parameter_access.v
+++ b/test_regress/t/t_interface_parameter_access.v
@@ -11,6 +11,8 @@ interface test_if #(parameter integer FOO = 1);
    // Interface variable
    logic 	data;
 
+   localparam integer BAR = FOO + 1;
+
    // Modport
    modport mp(
               import  getFoo,
@@ -76,6 +78,9 @@ module testmod
    localparam THE_FOO = intf.FOO;
    localparam THE_OTHER_FOO = intf_no_mp.FOO;
    localparam THE_ARRAY_FOO = intf_array[0].FOO;
+   localparam THE_BAR = intf.BAR;
+   localparam THE_OTHER_BAR = intf_no_mp.BAR;
+   localparam THE_ARRAY_BAR = intf_array[0].BAR;
 
    always @(posedge clk) begin
       if (THE_FOO != 5) begin
@@ -106,6 +111,30 @@ module testmod
       //         $display("%%Error: i.getFoo() = %0d", i.getFoo());
       //	 $stop;
       //      end
+      if (THE_BAR != 6) begin
+         $display("%%Error: THE_BAR = %0d", THE_BAR);
+         $stop;
+      end
+      if (THE_OTHER_BAR != 6) begin
+         $display("%%Error: THE_OTHER_BAR = %0d", THE_OTHER_BAR);
+         $stop;
+      end
+      if (THE_ARRAY_BAR != 8) begin
+         $display("%%Error: THE_ARRAY_BAR = %0d", THE_ARRAY_BAR);
+         $stop;
+      end
+      if (intf.BAR != 6) begin
+         $display("%%Error: intf.BAR = %0d", intf.BAR);
+	 $stop;
+      end
+      if (intf_no_mp.BAR != 6) begin
+         $display("%%Error: intf_no_mp.BAR = %0d", intf_no_mp.BAR);
+         $stop;
+      end
+      if (intf_array[0].BAR != 8) begin
+         $display("%%Error: intf_array[0].BAR = %0d", intf_array[0].BAR);
+         $stop;
+      end
       $write("*-* All Finished *-*\n");
       $finish;
    end