cgen: fix codegen for anon option fn struct field init (fix #24392) (#24400)

felipensp · web-flow · commit 5adfc55b82c8 · 2025-05-05T08:41:00.000+03:00
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -2295,6 +2295,7 @@ fn (mut g Gen) expr_with_tmp_var(expr ast.Expr, expr_typ ast.Type, ret_typ ast.T
 			g.writeln('${g.styp(ret_typ)} ${tmp_var};')
 		}
 		mut expr_is_fixed_array_var := false
+		mut fn_option_clone := false
 		if ret_typ_is_option {
 			if expr_typ_is_option && expr in [ast.StructInit, ast.ArrayInit, ast.MapInit] {
 				simple_assign = expr is ast.StructInit
@@ -2328,6 +2329,7 @@ fn (mut g Gen) expr_with_tmp_var(expr ast.Expr, expr_typ ast.Type, ret_typ ast.T
 							g.write('(')
 							g.write_fn_ptr_decl(&final_ret_sym.info, '')
 							g.write(')')
+							fn_option_clone = expr is ast.SelectorExpr && expr_typ.has_flag(.option)
 						}
 					}
 				}
@@ -2339,6 +2341,9 @@ fn (mut g Gen) expr_with_tmp_var(expr ast.Expr, expr_typ ast.Type, ret_typ ast.T
 			g.write('_result_ok(&(${styp}[]) { ')
 		}
 		g.expr_with_cast(expr, expr_typ, ret_typ)
+		if fn_option_clone {
+			g.write('.data')
+		}
 		if ret_typ_is_option {
 			if simple_assign {
 				g.writeln(';')
diff --git a/vlib/v/gen/c/struct.v b/vlib/v/gen/c/struct.v
@@ -742,21 +742,21 @@ fn (mut g Gen) struct_init_field(sfield ast.StructInitField, language ast.Langua
 						g.fixed_array_var_init(tmp_var, false, field_unwrap_sym.info.elem_type,
 							field_unwrap_sym.info.size)
 					} else {
-						g.struct_init_field_default(field_unwrap_typ, sfield)
+						g.struct_init_field_default(field_unwrap_typ, sfield, field_unwrap_sym)
 					}
 				}
 				else {
-					g.struct_init_field_default(field_unwrap_typ, sfield)
+					g.struct_init_field_default(field_unwrap_typ, sfield, field_unwrap_sym)
 				}
 			}
 		} else {
-			g.struct_init_field_default(field_unwrap_typ, sfield)
+			g.struct_init_field_default(field_unwrap_typ, sfield, field_unwrap_sym)
 		}
 		g.inside_cast_in_heap = inside_cast_in_heap // restore value for further struct inits
 	}
 }
 
-fn (mut g Gen) struct_init_field_default(field_unwrap_typ ast.Type, sfield &ast.StructInitField) {
+fn (mut g Gen) struct_init_field_default(field_unwrap_typ ast.Type, sfield &ast.StructInitField, field_unwrap_sym ast.TypeSymbol) {
 	if field_unwrap_typ != ast.voidptr_type && field_unwrap_typ != ast.nil_type
 		&& (sfield.expected_type.is_ptr() && !sfield.expected_type.has_flag(.shared_f))
 		&& !sfield.expected_type.has_flag(.option) && !field_unwrap_typ.is_any_kind_of_pointer()
@@ -769,6 +769,9 @@ fn (mut g Gen) struct_init_field_default(field_unwrap_typ ast.Type, sfield &ast.
 		g.expr_with_opt(sfield.expr, field_unwrap_typ, sfield.expected_type)
 	} else if sfield.expr is ast.LambdaExpr && sfield.expected_type.has_flag(.option) {
 		g.expr_opt_with_cast(sfield.expr, field_unwrap_typ, sfield.expected_type)
+	} else if field_unwrap_sym.kind == .function && sfield.expected_type.has_flag(.option) {
+		tmp_out_var := g.new_tmp_var()
+		g.expr_with_tmp_var(sfield.expr, field_unwrap_typ, sfield.expected_type, tmp_out_var)
 	} else {
 		g.left_is_opt = true
 		g.expr_with_cast(sfield.expr, field_unwrap_typ, sfield.expected_type)
diff --git a/vlib/v/tests/options/option_fn_struct_init_test.v b/vlib/v/tests/options/option_fn_struct_init_test.v
@@ -0,0 +1,47 @@
+type Baz = Foo
+
+@[heap]
+struct Foo {
+	a  int    = 123
+	b  string = 'b'
+	cb ?fn (&Foo)
+}
+
+@[heap]
+struct Bar {
+	a  int    = 321
+	b  string = 'a'
+	cb ?fn (&Baz)
+}
+
+fn g(a Foo) Foo {
+	return a
+}
+
+fn t(a Bar) Foo {
+	return g(a: 123, b: 'foo', cb: a.cb)
+}
+
+fn test_main() {
+	a := Foo{
+		cb: none
+	}
+
+	b := Foo{
+		cb: fn (a &Foo) {
+		}
+	}
+
+	w := Bar{
+		cb: b.cb
+	}
+
+	z := Bar{
+		cb: a.cb
+	}
+
+	t(a: 1, cb: a.cb)
+	t(a: 2, cb: b.cb)
+	t(a: 3, cb: w.cb)
+	t(a: 4, cb: z.cb)
+}

Original file line number	Diff line number	Diff line change
`@@ -2295,6 +2295,7 @@ fn (mut g Gen) expr_with_tmp_var(expr ast.Expr, expr_typ ast.Type, ret_typ ast.T`
`2295`	`2295`	`g.writeln('${g.styp(ret_typ)} ${tmp_var};')`
`2296`	`2296`	`}`
`2297`	`2297`	`mut expr_is_fixed_array_var := false`
	`2298`	`+ mut fn_option_clone := false`
`2298`	`2299`	`if ret_typ_is_option {`
`2299`	`2300`	`if expr_typ_is_option && expr in [ast.StructInit, ast.ArrayInit, ast.MapInit] {`
`2300`	`2301`	`simple_assign = expr is ast.StructInit`
`@@ -2328,6 +2329,7 @@ fn (mut g Gen) expr_with_tmp_var(expr ast.Expr, expr_typ ast.Type, ret_typ ast.T`
`2328`	`2329`	`g.write('(')`
`2329`	`2330`	`g.write_fn_ptr_decl(&final_ret_sym.info, '')`
`2330`	`2331`	`g.write(')')`
	`2332`	`+ fn_option_clone = expr is ast.SelectorExpr && expr_typ.has_flag(.option)`
`2331`	`2333`	`}`
`2332`	`2334`	`}`
`2333`	`2335`	`}`
`@@ -2339,6 +2341,9 @@ fn (mut g Gen) expr_with_tmp_var(expr ast.Expr, expr_typ ast.Type, ret_typ ast.T`
`2339`	`2341`	`g.write('_result_ok(&(${styp}[]) { ')`
`2340`	`2342`	`}`
`2341`	`2343`	`g.expr_with_cast(expr, expr_typ, ret_typ)`
	`2344`	`+ if fn_option_clone {`
	`2345`	`+ g.write('.data')`
	`2346`	`+ }`
`2342`	`2347`	`if ret_typ_is_option {`
`2343`	`2348`	`if simple_assign {`
`2344`	`2349`	`g.writeln(';')`
Original file line number	Diff line number	Diff line change
`@@ -742,21 +742,21 @@ fn (mut g Gen) struct_init_field(sfield ast.StructInitField, language ast.Langua`
`742`	`742`	`g.fixed_array_var_init(tmp_var, false, field_unwrap_sym.info.elem_type,`
`743`	`743`	`field_unwrap_sym.info.size)`
`744`	`744`	`} else {`
`745`		`- g.struct_init_field_default(field_unwrap_typ, sfield)`
	`745`	`+ g.struct_init_field_default(field_unwrap_typ, sfield, field_unwrap_sym)`
`746`	`746`	`}`
`747`	`747`	`}`
`748`	`748`	`else {`
`749`		`- g.struct_init_field_default(field_unwrap_typ, sfield)`
	`749`	`+ g.struct_init_field_default(field_unwrap_typ, sfield, field_unwrap_sym)`
`750`	`750`	`}`
`751`	`751`	`}`
`752`	`752`	`} else {`
`753`		`- g.struct_init_field_default(field_unwrap_typ, sfield)`
	`753`	`+ g.struct_init_field_default(field_unwrap_typ, sfield, field_unwrap_sym)`
`754`	`754`	`}`
`755`	`755`	`g.inside_cast_in_heap = inside_cast_in_heap // restore value for further struct inits`
`756`	`756`	`}`
`757`	`757`	`}`
`758`	`758`
`759`		`-fn (mut g Gen) struct_init_field_default(field_unwrap_typ ast.Type, sfield &ast.StructInitField) {`
	`759`	`+fn (mut g Gen) struct_init_field_default(field_unwrap_typ ast.Type, sfield &ast.StructInitField, field_unwrap_sym ast.TypeSymbol) {`
`760`	`760`	`if field_unwrap_typ != ast.voidptr_type && field_unwrap_typ != ast.nil_type`
`761`	`761`	`&& (sfield.expected_type.is_ptr() && !sfield.expected_type.has_flag(.shared_f))`
`762`	`762`	`&& !sfield.expected_type.has_flag(.option) && !field_unwrap_typ.is_any_kind_of_pointer()`
`@@ -769,6 +769,9 @@ fn (mut g Gen) struct_init_field_default(field_unwrap_typ ast.Type, sfield &ast.`
`769`	`769`	`g.expr_with_opt(sfield.expr, field_unwrap_typ, sfield.expected_type)`
`770`	`770`	`} else if sfield.expr is ast.LambdaExpr && sfield.expected_type.has_flag(.option) {`
`771`	`771`	`g.expr_opt_with_cast(sfield.expr, field_unwrap_typ, sfield.expected_type)`
	`772`	`+ } else if field_unwrap_sym.kind == .function && sfield.expected_type.has_flag(.option) {`
	`773`	`+ tmp_out_var := g.new_tmp_var()`
	`774`	`+ g.expr_with_tmp_var(sfield.expr, field_unwrap_typ, sfield.expected_type, tmp_out_var)`
`772`	`775`	`} else {`
`773`	`776`	`g.left_is_opt = true`
`774`	`777`	`g.expr_with_cast(sfield.expr, field_unwrap_typ, sfield.expected_type)`