Handle enumeration subtypes in generic arguments. Issue #618

NEWS.md

@@ -6,6 +6,8 @@
   producing a fatal error (#603).
 - Fixed a bug where data was not propagated through inout ports in
   certain conditions (#609).
+- The `-gNAME=VALUE` option to set generic values from the command line
+  now works correctly for subtypes of enumeration types (#618).
 
 ## Version 1.8.1 - 2023-01-23
 - Initial signal values for certain types were not dumped correctly in

src/elab.c

@@ -1697,10 +1697,13 @@ static tree_t elab_generic_parse(tree_t generic, const char *str)
             str, type_pp(type), istr(tree_ident(generic)));
 
    if (type_is_enum(type)) {
+      type_t base = type_base_recur(type);
+      tree_t lit = type_enum_literal(base, value.integer);
+
       tree_t result = tree_new(T_REF);
       tree_set_type(result, type);
       tree_set_ident(result, ident_new(str));
-      tree_set_ref(result, type_enum_literal(type, value.integer));
+      tree_set_ref(result, lit);
 
       return result;
    }

test/regress/issue618.vhd

@@ -0,0 +1,19 @@
+library ieee ;
+use ieee.std_logic_1164.all ;
+
+entity issue618 is
+  generic (
+    A    : std_logic := '0' ;
+    B      : std_logic := '1'
+  ) ;
+end entity;
+
+architecture test of issue618 is
+begin
+    p1: process is
+    begin
+        assert A = '1';
+        assert B = '0';
+        wait;
+    end process;
+end architecture;

test/regress/testlist.txt

@@ -712,3 +712,4 @@ cover10         cover,shell
 cmdline5        shell
 issue603        normal
 issue609        normal
+issue618        normal,gA='1',gB='0'