From 5566df56f12f7f7c9c1ceab67856841208527ef1 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Mon, 18 Aug 2025 10:38:13 -0300 Subject: [PATCH] cgen: fix generic return assign to ComptimeSelector (fix #25125) (#25131) --- vlib/v/gen/c/assign.v | 3 ++- .../comptime/comptime_selector_assign_test.v | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 vlib/v/tests/comptime/comptime_selector_assign_test.v diff --git a/vlib/v/gen/c/assign.v b/vlib/v/gen/c/assign.v index 114855d482..685ccd4f78 100644 --- a/vlib/v/gen/c/assign.v +++ b/vlib/v/gen/c/assign.v @@ -442,8 +442,9 @@ fn (mut g Gen) assign_stmt(node_ ast.AssignStmt) { if val.typ_key != '' { val_type = g.type_resolver.get_ct_type_or_default(val.typ_key, var_type) } - } else if val is ast.CallExpr { + } else if val is ast.CallExpr && val.return_type_generic.has_flag(.generic) { g.assign_ct_type = g.comptime.comptime_for_field_type + val_type = var_type } } else if mut left is ast.IndexExpr && val is ast.ComptimeSelector { if val.typ_key != '' { diff --git a/vlib/v/tests/comptime/comptime_selector_assign_test.v b/vlib/v/tests/comptime/comptime_selector_assign_test.v new file mode 100644 index 0000000000..9582592055 --- /dev/null +++ b/vlib/v/tests/comptime/comptime_selector_assign_test.v @@ -0,0 +1,25 @@ +module main + +struct AnyStruct[T] { + val T +} + +fn decode_struct[T]() T { + mut typ := T{} + $for field in T.fields { + typ.$(field.name) = decode_field(typ.$(field.name)) + } + return typ +} + +fn decode_field[T](_ T) T { + mut field := T{} + return field +} + +type Any = int | string | []Any + +fn test_main() { + decode_struct[AnyStruct[Any]]() + decode_struct[AnyStruct[[]Any]]() +}