From e3788e871e593ac9360bd269bb15e9de32f8edf7 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sat, 13 Mar 2021 13:04:13 -0500
Subject: [PATCH] Fix unpacked-in-class array reference assignments

---
 src/V3AstNodes.cpp                | 5 ++++-
 src/V3AstNodes.h                  | 4 ++--
 src/V3LinkResolve.cpp             | 2 +-
 src/V3Unknown.cpp                 | 4 ++--
 test_regress/t/t_class_format.out | 2 +-
 test_regress/t/t_class_format.v   | 5 +++++
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp
index 53341c960..c317b99ea 100644
--- a/src/V3AstNodes.cpp
+++ b/src/V3AstNodes.cpp
@@ -788,7 +788,7 @@ int AstNodeDType::widthPow2() const {
 }
 
 /// What is the base variable (or const) this dereferences?
-AstNode* AstArraySel::baseFromp(AstNode* nodep) {
+AstNode* AstArraySel::baseFromp(AstNode* nodep, bool overMembers) {
     // Else AstArraySel etc; search for the base
     while (nodep) {
         if (VN_IS(nodep, ArraySel)) {
@@ -797,6 +797,9 @@ AstNode* AstArraySel::baseFromp(AstNode* nodep) {
         } else if (VN_IS(nodep, Sel)) {
             nodep = VN_CAST(nodep, Sel)->fromp();
             continue;
+        } else if (overMembers && VN_IS(nodep, MemberSel)) {
+            nodep = VN_CAST(nodep, MemberSel)->fromp();
+            continue;
         }
         // AstNodeSelPre stashes the associated variable under an ATTROF
         // of AstAttrType::VAR_BASE/MEMBER_BASE so it isn't constified
diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h
index d47b7767a..5da14deca 100644
--- a/src/V3AstNodes.h
+++ b/src/V3AstNodes.h
@@ -1595,8 +1595,8 @@ public:
     virtual bool same(const AstNode* samep) const override { return true; }
     virtual int instrCount() const override { return widthInstrs(); }
     // Special operators
-    static AstNode*
-    baseFromp(AstNode* nodep);  ///< What is the base variable (or const) this dereferences?
+    // Return base var (or const) nodep dereferences
+    static AstNode* baseFromp(AstNode* nodep, bool overMembers);
 };
 
 class AstAssocSel final : public AstNodeSel {
diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp
index f2f4c33a2..76339ebc2 100644
--- a/src/V3LinkResolve.cpp
+++ b/src/V3LinkResolve.cpp
@@ -218,7 +218,7 @@ private:
             // variable we're extracting from (to determine MSB/LSB/endianness/etc.)
             // So we replicate it in another node
             // Note that V3Param knows not to replace AstVarRef's under AstAttrOf's
-            AstNode* basefromp = AstArraySel::baseFromp(nodep);
+            AstNode* basefromp = AstArraySel::baseFromp(nodep, false);
             if (AstNodeVarRef* varrefp
                 = VN_CAST(basefromp, NodeVarRef)) {  // Maybe varxref - so need to clone
                 nodep->attrp(new AstAttrOf(nodep->fileline(), AstAttrType::VAR_BASE,
diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp
index 51ed39b09..5878a70c9 100644
--- a/src/V3Unknown.cpp
+++ b/src/V3Unknown.cpp
@@ -357,7 +357,7 @@ private:
         iterateChildren(nodep);
         if (!nodep->user1SetOnce()) {
             // Guard against reading/writing past end of bit vector array
-            AstNode* basefromp = AstArraySel::baseFromp(nodep);
+            AstNode* basefromp = AstArraySel::baseFromp(nodep, true);
             bool lvalue = false;
             if (const AstNodeVarRef* varrefp = VN_CAST(basefromp, NodeVarRef)) {
                 lvalue = varrefp->access().isWriteOrRW();
@@ -405,7 +405,7 @@ private:
         if (!nodep->user1SetOnce()) {
             if (debug() == 9) nodep->dumpTree(cout, "-in: ");
             // Guard against reading/writing past end of arrays
-            AstNode* basefromp = AstArraySel::baseFromp(nodep->fromp());
+            AstNode* basefromp = AstArraySel::baseFromp(nodep->fromp(), true);
             bool lvalue = false;
             if (const AstNodeVarRef* varrefp = VN_CAST(basefromp, NodeVarRef)) {
                 lvalue = varrefp->access().isWriteOrRW();
diff --git a/test_regress/t/t_class_format.out b/test_regress/t/t_class_format.out
index 8005604fe..36d844b8d 100644
--- a/test_regress/t/t_class_format.out
+++ b/test_regress/t/t_class_format.out
@@ -1,2 +1,2 @@
-''{b:'h1, i:'h2a, carray4:'{'h0, 'h0, 'h0, 'h0} }'
+''{b:'h1, i:'h2a, carray4:'{'h11, 'h22, 'h33, 'h44} }'
 *-* All Finished *-*
diff --git a/test_regress/t/t_class_format.v b/test_regress/t/t_class_format.v
index a280d126b..9f2240814 100644
--- a/test_regress/t/t_class_format.v
+++ b/test_regress/t/t_class_format.v
@@ -23,6 +23,11 @@ module t (/*AUTOARG*/);
       c = new;
       c.b = '1;
       c.i = 42;
+
+      c.carray4[0] = 16'h11;
+      c.carray4[1] = 16'h22;
+      c.carray4[2] = 16'h33;
+      c.carray4[3] = 16'h44;
       $display("'%p'", c);
 
       $write("*-* All Finished *-*\n");