From 1a6bb3d4e4656e55013a1b5e4a6ea72763c3e582 Mon Sep 17 00:00:00 2001
From: CreeperFace <165158232+dy-tea@users.noreply.github.com>
Date: Thu, 16 Oct 2025 13:15:16 +0100
Subject: [PATCH] checker: correctly detect variadic arg passed to struct fn
 (fix #25504) (#25509)

---
 vlib/v/checker/fn.v                           | 10 +++++-----
 .../sumtype_array_to_vararg_struct_fn_test.v  | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 vlib/v/tests/sumtypes/sumtype_array_to_vararg_struct_fn_test.v

diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v
index aca23e3ab..e0b7bae54 100644
--- a/vlib/v/checker/fn.v
+++ b/vlib/v/checker/fn.v
@@ -1530,7 +1530,7 @@ fn (mut c Checker) fn_call(mut node ast.CallExpr, mut continue_check &bool) ast.
 			if i == args_len - 1 {
 				c.check_variadic_arg(call_arg.expr, typ, expected_type, param.typ, i + 1,
 					func.name, func.is_method, func.is_variadic, args_len == 1 && i == 0,
-					node.pos, call_arg.pos)
+					func.generic_names.len > 0, node.pos, call_arg.pos)
 			}
 		} else {
 			c.expected_type = param.typ
@@ -2542,8 +2542,8 @@ fn (mut c Checker) method_call(mut node ast.CallExpr, mut continue_check &bool)
 			typ := c.expr(mut arg.expr)
 			if i == node.args.len - 1 {
 				c.check_variadic_arg(arg.expr, typ, expected_type, param.typ, i + 1, method.name,
-					true, method.is_variadic, node.args.len == 1 && i == 0, node.pos,
-					arg.pos)
+					true, method.is_variadic, node.args.len == 1 && i == 0, method.generic_names.len > 0,
+					node.pos, arg.pos)
 			}
 		} else {
 			c.expected_type = param.typ
@@ -3980,11 +3980,11 @@ fn (mut c Checker) has_veb_context(typ ast.Type) bool {
 
 fn (mut c Checker) check_variadic_arg(arg_expr ast.Expr, typ ast.Type, expected_type ast.Type, param_typ ast.Type,
 	arg_num int, fn_name string, is_method bool, fn_is_variadic bool, is_single_array_arg bool,
-	call_pos token.Pos, arg_pos token.Pos) {
+	is_generic_fn bool, call_pos token.Pos, arg_pos token.Pos) {
 	kind := c.table.sym(typ).kind
 	is_decompose := arg_expr is ast.ArrayDecompose
 	mut allow_variadic_pass := false
-	if arg_expr is ast.Ident && !is_method {
+	if arg_expr is ast.Ident && !(is_method && is_generic_fn) {
 		ident := arg_expr as ast.Ident
 		if ident.obj is ast.Var {
 			var_obj := ident.obj as ast.Var
diff --git a/vlib/v/tests/sumtypes/sumtype_array_to_vararg_struct_fn_test.v b/vlib/v/tests/sumtypes/sumtype_array_to_vararg_struct_fn_test.v
new file mode 100644
index 000000000..bcbd710eb
--- /dev/null
+++ b/vlib/v/tests/sumtypes/sumtype_array_to_vararg_struct_fn_test.v
@@ -0,0 +1,19 @@
+struct Foo {
+}
+
+type Type = string | int
+
+fn (f Foo) b(t ...Type) int {
+	return 0
+}
+
+fn (f Foo) a(f2 &Foo, t ...Type) int {
+	a := f2.b(t)
+	return a
+}
+
+fn test_main() {
+	f := Foo{}
+	t := []Type{}
+	assert f.a(&f, ...t) == 0
+}
-- 
2.39.5