fix mismatch_assignment error reported for generic arguments using items imported at an enclosing scope

(refs: #3120)

Author: taichi-ishitani

crates/analyzer/src/scope.rs

@@ -861,27 +861,55 @@ pub fn import_package_path(
     None
 }
 
+/// Whether `scope` is a container `import` is declared directly under, i.e. the
+/// point the import-visibility walk stops at.
+fn is_import_container(scope: ScopeId) -> bool {
+    SCOPE_ARENA.with(|f| {
+        f.borrow().scopes.get(scope.0 as usize).is_some_and(|s| {
+            matches!(
+                s.kind,
+                ScopeKind::Module | ScopeKind::Interface | ScopeKind::Package
+            )
+        })
+    })
+}
+
 /// Whether `symbol` (named `name`, declared under `symbol_define_context`) is
-/// imported directly into `namespace`, matching its exact paths and ifdef
-/// context. Wildcard members are additionally gated by the source container's
-/// ifdef context, mirroring the resolver's `Tier 2` wildcard visibility so an
+/// imported into `namespace`, matching its exact paths and ifdef context.
+/// Wildcard members are additionally gated by the source container's ifdef
+/// context, mirroring the resolver's `Tier 2` wildcard visibility so an
 /// ifdef-excluded member is not treated as imported.
+///
+/// An `import` under a module/interface/package takes effect across all of it,
+/// so a nested scope (generate block, function) also sees the bindings of the
+/// scopes enclosing it up to and including that container. The walk stops there
+/// because `import` is not visible across a container boundary.
 pub fn is_imported(
     namespace: &Namespace,
     symbol: SymbolId,
     name: StrId,
     symbol_define_context: &DefineContext,
 ) -> bool {
-    let scope = intern_namespace(namespace);
     let dctx = &namespace.define_context;
-    imports_get(scope, name)
-        .iter()
-        .any(|b| b.symbol == symbol && &b.define_context == dctx)
-        || wildcards_get(scope).iter().any(|w| {
-            &w.define_context == dctx
-                && !symbol_define_context.exclusive(&w.source_define_context)
-                && locals_get(w.source, name).contains(&symbol)
-        })
+    let mut current = Some(intern_namespace(namespace));
+    while let Some(scope) = current {
+        let imported = imports_get(scope, name)
+            .iter()
+            .any(|b| b.symbol == symbol && &b.define_context == dctx)
+            || wildcards_get(scope).iter().any(|w| {
+                &w.define_context == dctx
+                    && !symbol_define_context.exclusive(&w.source_define_context)
+                    && locals_get(w.source, name).contains(&symbol)
+            });
+        if imported {
+            return true;
+        }
+        if is_import_container(scope) {
+            break;
+        }
+        current = parent(scope);
+    }
+    false
 }
 
 /// Returns the wildcard imports declared directly in `scope`.

testcases/map/25_dependency_1.sv.map

@@ -0,0 +1,7 @@
+pub interface baz_if::<PKG: baz_proto_pkg> {
+    var baz_0: logic<PKG::BAZ_0>;
+    var baz_1: logic<PKG::BAZ_1>;
+    modport mp {
+        ..output
+    }
+}

testcases/map/25_dependency_2.sv.map

@@ -0,0 +1,6 @@
+pub module baz_module::<PKG: baz_proto_pkg> (
+    baz: modport baz_if::<PKG>::mp,
+) {
+    assign baz.baz_0 = 0;
+    assign baz.baz_1 = 1;
+}

testcases/sample/src/baz_if.veryl

@@ -1,7 +1,9 @@
 pub proto package baz_proto_pkg {
-    const BAZ: u32;
+    const BAZ_0: u32;
+    const BAZ_1: u32;
 }
 
-pub package baz_pkg::<V: u32> for baz_proto_pkg {
-    const BAZ: u32 = V;
+pub package baz_pkg::<V0: u32, V1: u32> for baz_proto_pkg {
+    const BAZ_0: u32 = V0;
+    const BAZ_1: u32 = V1;
 }

testcases/sample/src/baz_module.veryl

@@ -6,4 +6,10 @@ package veryl_testcase___Package25__1;
         logic [C-1:0] s;
     } S;
 endpackage
+package veryl_testcase___Package25__2;
+    localparam int unsigned C = 2;
+    typedef struct packed {
+        logic [C-1:0] s;
+    } S;
+endpackage
 //# sourceMappingURL=../map/25_dependency_1.sv.map

testcases/sample/src/baz_pkg.veryl

@@ -4,7 +4,7 @@
 
 module veryl_testcase_Module25A
     import veryl_sample4___bar_pkg__32::*;
-    import veryl_sample4___baz_pkg__veryl_testcase___Package25__1_C::*;
+    import veryl_sample4___baz_pkg__veryl_testcase___Package25__1_C__veryl_testcase___Package25__2_C::*;
 (
     input var logic                    i_clk  ,
     input var logic                    i_rst_n,
@@ -101,8 +101,31 @@ module veryl_testcase_Module25F #(
 endmodule
 
 module veryl_testcase_Module25G;
-    import veryl_sample4___baz_pkg__veryl_testcase___Package25__1_C::BAZ;
+    import veryl_sample4___baz_pkg__veryl_testcase___Package25__1_C__veryl_testcase___Package25__2_C::BAZ_0;
+    import veryl_sample4___baz_pkg__veryl_testcase___Package25__1_C__veryl_testcase___Package25__2_C::BAZ_1;
 
-    int unsigned _f; always_comb _f = BAZ;
+
+    int unsigned _f0; always_comb _f0 = BAZ_0;
+    int unsigned _f1; always_comb _f1 = BAZ_1;
+endmodule
+
+package veryl_testcase_Pacakge25H;
+
+
+
+
+endpackage
+
+module veryl_testcase_Module25I;
+
+
+
+
+    veryl_sample4___baz_if__veryl_sample4___baz_pkg__veryl_sample4___baz_pkg__1__2_BAZ_0__3 baz ();
+    if (1) begin :g
+        veryl_sample4___baz_module__veryl_sample4___baz_pkg__veryl_sample4___baz_pkg__1__2_BAZ_0__3 u (
+            .baz (baz)
+        );
+    end
 endmodule
 //# sourceMappingURL=../map/25_dependency_2.sv.map

testcases/sv/25_dependency_1.sv

@@ -1,6 +1,6 @@
 alias package barpkg = veryl_sample4::bar_pkg::<32>;
 alias package foopkg = veryl_sample4::foo_pkg::<barpkg::BAR>;
-alias package bazpkg = veryl_sample4::baz_pkg::<Package25::<1>::C>;
+alias package bazpkg = veryl_sample4::baz_pkg::<Package25::<1>::C, Package25::<2>::C>;
 
 module Module25A (
     i_clk : input   clock                         ,
@@ -87,6 +87,27 @@ module Module25F #(
 }
 
 module Module25G {
-    import bazpkg::BAZ;
-    let _f: u32 = BAZ;
+    import bazpkg::BAZ_0;
+    import bazpkg::BAZ_1;
+    let _f0: u32 = BAZ_0;
+    let _f1: u32 = BAZ_1;
+}
+
+package Pacakge25H {
+    gen BAZ_0_VALUE: u32 = 1;
+    gen BAZ_1_VALUE: u32 = 2;
+    alias package baz_1_2 = veryl_sample4::baz_pkg::<BAZ_0_VALUE, BAZ_1_VALUE>;
+}
+
+module Module25I {
+    import Pacakge25H::baz_1_2;
+
+    alias package baz_1_3 = veryl_sample4::baz_pkg::<baz_1_2::BAZ_0, 3>;
+
+    inst baz: veryl_sample4::baz_if::<baz_1_3>;
+    :g {
+        inst u: veryl_sample4::baz_module::<baz_1_3> (
+            baz: baz,
+        );
+    }
 }