Add a test case for issue #1030

Author: nickg

src/rt/wave.c

@@ -782,8 +782,8 @@ static void fst_create_record_array_var(wave_dumper_t *wd, tree_t d,
    }
 }
 
-static void fst_alias_var(wave_dumper_t *wd, tree_t d, rt_signal_t *s,
-                          text_buf_t *tb)
+static void fst_alias_var(wave_dumper_t *wd, tree_t d, rt_scope_t *scope,
+                          rt_signal_t *s, text_buf_t *tb)
 {
    rt_watch_t *w = find_watch(&(s->nexus), fst_event_cb);
    if (w == NULL)
@@ -800,7 +800,7 @@ static void fst_alias_var(wave_dumper_t *wd, tree_t d, rt_signal_t *s,
    if (type_is_array(type)) {
       int64_t left, right, length;
       range_kind_t dir;
-      fst_get_array_range(wd, type, s->parent, s->where, 0,
+      fst_get_array_range(wd, type, scope, d, 0,
                           &left, &right, &dir, &length);
 
       tb_printf(tb, "[%"PRIi64":%"PRIi64"]", left, right);
@@ -829,7 +829,7 @@ static void fst_process_signal(wave_dumper_t *wd, rt_scope_t *scope, tree_t d,
       if (s == NULL)
          return;
       else if (s->where != d)
-         fst_alias_var(wd, d, s, tb);  // Collapsed with another signal
+         fst_alias_var(wd, d, scope, s, tb);  // Collapsed with another signal
       else if (type_is_array(type))
          fst_create_array_var(wd, d, s, type, tb);
       else

test/regress/gold/issue1030.dump

@@ -0,0 +1,10 @@
+$comment issue1030.b.p[7:0] is aliased to z[1:8] $end
+#0 issue1030.s[2].f.z[1:8] 00000000
+#0 issue1030.s[2].f.y[7:0] 00000000
+#0 issue1030.s[2].f.x 0
+#0 issue1030.s[1].f.z[1:8] 00000000
+#0 issue1030.s[1].f.y[7:0] 00000000
+#0 issue1030.s[1].f.x 0
+#1000000 issue1030.s[1].f.x 1
+#1000000 issue1030.s[1].f.y[7:0] 00000001
+#1000000 issue1030.s[1].f.z[1:8] 00000010

test/regress/issue1030.vhd

@@ -0,0 +1,45 @@
+package pack is
+    generic ( N : natural );
+
+    type t_rec is record
+        x : bit;
+        y : bit_vector(7 downto 0);
+        z : bit_vector(1 to N);
+    end record;
+
+    type t_rec2 is record
+        f : t_rec;
+    end record;
+
+    type t_array is array (natural range <>) of t_rec2;
+
+    impure function get_width return integer;
+end package;
+
+package body pack is
+    impure function get_width return integer is
+    begin
+        return N;
+    end function;
+end package body;
+
+package pack8 is new work.pack generic map (8);
+
+entity issue1030 is
+end entity;
+
+use work.pack8.all;
+
+architecture test of issue1030 is
+    signal s : t_array(1 to 2);
+begin
+
+    b: block is
+        port ( p : in bit_vector(get_width - 1 downto 0) );
+        port map ( s(1).f.z );
+    begin
+    end block;
+
+    s(1) <= (f => ('1', X"01", X"02")) after 1 ns;
+
+end architecture;

test/regress/testlist.txt

@@ -1065,3 +1065,4 @@ psl12           normal,2008
 psl13           fail,gold,psl
 issue1045       normal,vhpi
 issue1044       mixed
+issue1030       wave,2008,dump-arrays