From 58ea7ad3613a37911cdf0f61147d628dd654a7bd Mon Sep 17 00:00:00 2001
From: Kamil Rakoczy <krakoczy@antmicro.com>
Date: Tue, 10 Jun 2025 18:03:26 +0200
Subject: [PATCH] Fix class typedef elaboration (#6080)

---
 src/V3Param.cpp                           |  4 ++--
 test_regress/t/t_forward_nested_typedef.v | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/V3Param.cpp b/src/V3Param.cpp
index 20eada2ff..d3ceb7a24 100644
--- a/src/V3Param.cpp
+++ b/src/V3Param.cpp
@@ -1167,7 +1167,7 @@ class ParamVisitor final : public VNVisitor {
     void relinkDots() {
         for (AstDot* const dotp : m_dots) {
             const AstClassOrPackageRef* const classRefp = VN_AS(dotp->lhsp(), ClassOrPackageRef);
-            const AstClass* const lhsClassp = VN_AS(classRefp->classOrPackageNodep(), Class);
+            const AstClass* const lhsClassp = VN_AS(classRefp->classOrPackageSkipp(), Class);
             AstClassOrPackageRef* const rhsp = VN_AS(dotp->rhsp(), ClassOrPackageRef);
             for (auto* itemp = lhsClassp->membersp(); itemp; itemp = itemp->nextp()) {
                 if (itemp->name() == rhsp->name()) {
@@ -1323,7 +1323,7 @@ class ParamVisitor final : public VNVisitor {
         // by a class with actual parameter values.
         const AstClass* lhsClassp = nullptr;
         const AstClassOrPackageRef* const classRefp = VN_CAST(nodep->lhsp(), ClassOrPackageRef);
-        if (classRefp) lhsClassp = VN_CAST(classRefp->classOrPackageNodep(), Class);
+        if (classRefp) lhsClassp = VN_CAST(classRefp->classOrPackageSkipp(), Class);
         AstNode* rhsDefp = nullptr;
         AstClassOrPackageRef* const rhsp = VN_CAST(nodep->rhsp(), ClassOrPackageRef);
         if (rhsp) rhsDefp = rhsp->classOrPackageNodep();
diff --git a/test_regress/t/t_forward_nested_typedef.v b/test_regress/t/t_forward_nested_typedef.v
index 5d2c54fed..ff643e21c 100644
--- a/test_regress/t/t_forward_nested_typedef.v
+++ b/test_regress/t/t_forward_nested_typedef.v
@@ -6,12 +6,18 @@
 
 typedef class Bar;
 typedef Bar Baz;
+typedef Quux #(16, 32) Quux_t;
+typedef Quux_t Quuux_t;
 
 module t;
     initial begin
         Bar::Qux::boo(1);
         Baz::Qux::boo(1);
+        Quux_t::Qux::boo(1);
+        Quuux_t::Qux::boo(1);
         if (!Bar::Qux::finish) $stop;
+        if (!Quux_t::Qux::finish) $stop;
+        if (!Quuux_t::Qux::finish) $stop;
         $write("*-* All Finished *-*\n");
         $finish;
     end
@@ -34,3 +40,8 @@ endclass
 class Bar;
     typedef Foo#(Bar) Qux;
 endclass
+
+class Quux #(PARA_A = 1, PARA_B = 2);
+    typedef Quux #(PARA_A, PARA_B) this_t;
+    typedef Foo#(this_t) Qux;
+endclass