cgen: fix codegen for sumtype cast from option variants on map_set (fix #23654) (#23669)

felipensp · web-flow · commit 0632822fd40a · 2025-02-08T20:31:23.000+02:00
diff --git a/vlib/v/gen/c/assign.v b/vlib/v/gen/c/assign.v
@@ -119,8 +119,8 @@ fn (mut g Gen) expr_opt_with_cast(expr ast.Expr, expr_typ ast.Type, ret_typ ast.
 				if ret_sym.kind == .sum_type {
 					exp_sym := g.table.sym(expr_typ)
 					fname := g.get_sumtype_casting_fn(expr_typ, ret_typ)
-					g.call_cfn_for_casting_expr(fname, expr, ret_typ.is_ptr(), ret_sym.cname,
-						expr_typ.is_ptr(), exp_sym.kind == .function, g.styp(expr_typ))
+					g.call_cfn_for_casting_expr(fname, expr, ret_typ, ret_sym.cname, expr_typ.is_ptr(),
+						exp_sym.kind == .function, g.styp(expr_typ))
 				} else {
 					g.write('*((${g.base_type(expr_typ)}*)')
 					g.expr(expr)
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -2702,11 +2702,11 @@ fn (mut g Gen) write_sumtype_casting_fn(fun SumtypeCastingFn) {
 	g.auto_fn_definitions << sb.str()
 }
 
-fn (mut g Gen) call_cfn_for_casting_expr(fname string, expr ast.Expr, exp_is_ptr bool, exp_styp string,
+fn (mut g Gen) call_cfn_for_casting_expr(fname string, expr ast.Expr, exp ast.Type, exp_styp string,
 	got_is_ptr bool, got_is_fn bool, got_styp string) {
 	mut rparen_n := 1
 	is_comptime_variant := expr is ast.Ident && g.comptime.is_comptime_variant_var(expr)
-	if exp_is_ptr {
+	if exp.is_ptr() {
 		g.write('HEAP(${exp_styp}, ')
 		rparen_n++
 	}
@@ -2744,7 +2744,10 @@ fn (mut g Gen) call_cfn_for_casting_expr(fname string, expr ast.Expr, exp_is_ptr
 			ast.void_type)
 		g.write(g.type_default(ctyp))
 	} else {
+		old_left_is_opt := g.left_is_opt
+		g.left_is_opt = !exp.has_flag(.option)
 		g.expr(expr)
+		g.left_is_opt = old_left_is_opt
 	}
 	g.write(')'.repeat(rparen_n))
 }
@@ -2838,8 +2841,8 @@ fn (mut g Gen) expr_with_cast(expr ast.Expr, got_type_raw ast.Type, expected_typ
 			if exp_sym.info.is_generic {
 				fname = g.generic_fn_name(exp_sym.info.concrete_types, fname)
 			}
-			g.call_cfn_for_casting_expr(fname, expr, expected_is_ptr, exp_styp, true,
-				false, got_styp)
+			g.call_cfn_for_casting_expr(fname, expr, expected_type, exp_styp, true, false,
+				got_styp)
 			g.inside_cast_in_heap--
 		} else {
 			got_styp := g.cc_type(got_type, true)
@@ -2865,7 +2868,7 @@ fn (mut g Gen) expr_with_cast(expr ast.Expr, got_type_raw ast.Type, expected_typ
 					return
 				}
 			}
-			g.call_cfn_for_casting_expr(fname, expr, expected_is_ptr, exp_styp, got_is_ptr,
+			g.call_cfn_for_casting_expr(fname, expr, expected_type, exp_styp, got_is_ptr,
 				false, got_styp)
 		}
 		return
@@ -2930,7 +2933,7 @@ fn (mut g Gen) expr_with_cast(expr ast.Expr, got_type_raw ast.Type, expected_typ
 					g.write('${fname}(&${tmp_var})')
 					return
 				} else {
-					g.call_cfn_for_casting_expr(fname, expr, expected_is_ptr, unwrapped_exp_sym.cname,
+					g.call_cfn_for_casting_expr(fname, expr, expected_type, unwrapped_exp_sym.cname,
 						got_is_ptr, got_is_fn, got_styp)
 				}
 			}
diff --git a/vlib/v/tests/options/option_sumtype_map_test.v b/vlib/v/tests/options/option_sumtype_map_test.v
@@ -0,0 +1,16 @@
+type Any = ?int | ?string
+
+fn test_main() {
+	nothing := ?int(none)
+	zero := ?int(0)
+	one := ?string('one')
+	ten := ?int(10)
+
+	mut m := map[string]Any{}
+	m['nothing'] = Any(nothing)
+	m['zero'] = Any(zero)
+	m['one'] = Any(one)
+	m['ten'] = Any(ten)
+
+	assert m.str() == "{'nothing': Any(Option(none)), 'zero': Any(Option(0)), 'one': Any(Option('one')), 'ten': Any(Option(10))}"
+}

Original file line number	Diff line number	Diff line change
`@@ -2702,11 +2702,11 @@ fn (mut g Gen) write_sumtype_casting_fn(fun SumtypeCastingFn) {`
`2702`	`2702`	`g.auto_fn_definitions << sb.str()`
`2703`	`2703`	`}`
`2704`	`2704`
`2705`		`-fn (mut g Gen) call_cfn_for_casting_expr(fname string, expr ast.Expr, exp_is_ptr bool, exp_styp string,`
	`2705`	`+fn (mut g Gen) call_cfn_for_casting_expr(fname string, expr ast.Expr, exp ast.Type, exp_styp string,`
`2706`	`2706`	`got_is_ptr bool, got_is_fn bool, got_styp string) {`
`2707`	`2707`	`mut rparen_n := 1`
`2708`	`2708`	`is_comptime_variant := expr is ast.Ident && g.comptime.is_comptime_variant_var(expr)`
`2709`		`- if exp_is_ptr {`
	`2709`	`+ if exp.is_ptr() {`
`2710`	`2710`	`g.write('HEAP(${exp_styp}, ')`
`2711`	`2711`	`rparen_n++`
`2712`	`2712`	`}`
`@@ -2744,7 +2744,10 @@ fn (mut g Gen) call_cfn_for_casting_expr(fname string, expr ast.Expr, exp_is_ptr`
`2744`	`2744`	`ast.void_type)`
`2745`	`2745`	`g.write(g.type_default(ctyp))`
`2746`	`2746`	`} else {`
	`2747`	`+ old_left_is_opt := g.left_is_opt`
	`2748`	`+ g.left_is_opt = !exp.has_flag(.option)`
`2747`	`2749`	`g.expr(expr)`
	`2750`	`+ g.left_is_opt = old_left_is_opt`
`2748`	`2751`	`}`
`2749`	`2752`	`g.write(')'.repeat(rparen_n))`
`2750`	`2753`	`}`
`@@ -2838,8 +2841,8 @@ fn (mut g Gen) expr_with_cast(expr ast.Expr, got_type_raw ast.Type, expected_typ`
`2838`	`2841`	`if exp_sym.info.is_generic {`
`2839`	`2842`	`fname = g.generic_fn_name(exp_sym.info.concrete_types, fname)`
`2840`	`2843`	`}`
`2841`		`- g.call_cfn_for_casting_expr(fname, expr, expected_is_ptr, exp_styp, true,`
`2842`		`- false, got_styp)`
	`2844`	`+ g.call_cfn_for_casting_expr(fname, expr, expected_type, exp_styp, true, false,`
	`2845`	`+ got_styp)`
`2843`	`2846`	`g.inside_cast_in_heap--`
`2844`	`2847`	`} else {`
`2845`	`2848`	`got_styp := g.cc_type(got_type, true)`
`@@ -2865,7 +2868,7 @@ fn (mut g Gen) expr_with_cast(expr ast.Expr, got_type_raw ast.Type, expected_typ`
`2865`	`2868`	`return`
`2866`	`2869`	`}`
`2867`	`2870`	`}`
`2868`		`- g.call_cfn_for_casting_expr(fname, expr, expected_is_ptr, exp_styp, got_is_ptr,`
	`2871`	`+ g.call_cfn_for_casting_expr(fname, expr, expected_type, exp_styp, got_is_ptr,`
`2869`	`2872`	`false, got_styp)`
`2870`	`2873`	`}`
`2871`	`2874`	`return`
`@@ -2930,7 +2933,7 @@ fn (mut g Gen) expr_with_cast(expr ast.Expr, got_type_raw ast.Type, expected_typ`
`2930`	`2933`	`g.write('${fname}(&${tmp_var})')`
`2931`	`2934`	`return`
`2932`	`2935`	`} else {`
`2933`		`- g.call_cfn_for_casting_expr(fname, expr, expected_is_ptr, unwrapped_exp_sym.cname,`
	`2936`	`+ g.call_cfn_for_casting_expr(fname, expr, expected_type, unwrapped_exp_sym.cname,`
`2934`	`2937`	`got_is_ptr, got_is_fn, got_styp)`
`2935`	`2938`	`}`
`2936`	`2939`	`}`