Skip to content

Commit

Permalink
checker: fix generic fn call with empty array argument (fix #22843) (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
yuyi98 authored Nov 13, 2024
1 parent 70112d8 commit 1a9dab2
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
10 changes: 9 additions & 1 deletion vlib/v/checker/fn.v
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,15 @@ fn (mut c Checker) fn_call(mut node ast.CallExpr, mut continue_check &bool) ast.
} else {
func.params[i]
}
c.expected_type = param.typ
if param.typ.has_flag(.generic) {
if unwrap_typ := c.table.convert_generic_type(param.typ, func.generic_names,
concrete_types)
{
c.expected_type = unwrap_typ
}
} else {
c.expected_type = param.typ
}
already_checked := node.language != .js && call_arg.expr is ast.CallExpr
typ := c.check_expr_option_or_result_call(call_arg.expr, if already_checked
&& mut call_arg.expr is ast.CallExpr {
Expand Down
29 changes: 29 additions & 0 deletions vlib/v/tests/generics/generics_with_empty_array_arg_test.v
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
fn count_str(array []string) int {
return array.len
}

fn count_int(array []int) int {
return array.len
}

fn count[T](array []T) int {
return array.len
}

fn test_generics_with_empty_array_arg() {
assert count_str(['one', 'two']) == 2
assert count_str([]string{}) == 0
assert count_str([]) == 0

assert count_int([1, 2]) == 2
assert count_int([]int{}) == 0
assert count_int([]) == 0

assert count[f64]([1.0, 2.0]) == 2
assert count[f64]([]f64{}) == 0
assert count[f64]([]) == 0

assert count[int]([1, 2]) == 2
assert count[int]([]int{}) == 0
assert count[int]([]) == 0
}

0 comments on commit 1a9dab2

Please sign in to comment.