Merge pull request #1049 from alainmarcel/alainmarcel-patch-1

array_typespec member
chipsalliance · Oct 31, 2023 · 854f267 · 854f267
2 parents 4955442 + 955d5bc
commit 854f267
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # -*- mode:cmake -*-
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-project(UHDM VERSION 1.76)
+project(UHDM VERSION 1.77)
 
 # Detect build type, fallback to release and throw a warning if use didn't
 # specify any

diff --git a/templates/ExprEval.cpp b/templates/ExprEval.cpp
@@ -2568,10 +2568,12 @@ any *ExprEval::hierarchicalSelector(std::vector<std::string> &select_path,
         }
         tmp->Ranges(tmpR);
         return tmp;
-      } else {
-        // Must be unpacked struct
-        return object;
-      }
+      } 
+    } else if (const array_typespec *ltps =
+                   any_cast<const array_typespec *>(object)) {
+      if (const ref_typespec *rt = ltps->Elem_typespec()) {
+        return (typespec *)rt->Actual_typespec();
+      } 
     } else if (constant *c = any_cast<constant *>(object)) {
       if (expr *tmp = reduceBitSelect(c, selectIndex, invalidValue, inst, pexpr,
                                       muteError)) {