cgen: fix generic result return (fix #24097) (#24100)

kbkpbot · web-flow · commit a59b717daa22 · 2025-04-01T15:54:19.000+03:00
diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v
@@ -980,6 +980,16 @@ fn (mut g Gen) call_expr(node ast.CallExpr) {
 						ret_typ = g.unwrap_generic(ret_sym.info.elem_type).derive(unwrapped_ret_typ)
 					}
 				}
+			} else {
+				r_typ := g.resolve_return_type(node)
+				if r_typ != ast.void_type && !r_typ.has_flag(.generic) {
+					// restore result/option flag, as `resolve_return_type` may clean them
+					if node.return_type.has_flag(.result) {
+						ret_typ = r_typ.set_flag(.result)
+					} else {
+						ret_typ = r_typ.set_flag(.option)
+					}
+				}
 			}
 		}
 		mut styp := g.styp(ret_typ)
diff --git a/vlib/v/tests/generics/generics_return_result_maps_test.v b/vlib/v/tests/generics/generics_return_result_maps_test.v
@@ -0,0 +1,15 @@
+fn decode_map[K, V](a map[K]V) !map[K]V {
+	return a
+}
+
+fn decode[T]() !T {
+	return decode_map(T{})!
+}
+
+fn test_main() {
+	x_str_str := decode[map[string]string]() or { panic(err) }
+	x_str_int := decode[map[string]int]() or { panic(err) }
+
+	assert typeof(x_str_str).name == 'map[string]string'
+	assert typeof(x_str_int).name == 'map[string]int'
+}

Original file line number	Diff line number	Diff line change
`@@ -980,6 +980,16 @@ fn (mut g Gen) call_expr(node ast.CallExpr) {`
`980`	`980`	`ret_typ = g.unwrap_generic(ret_sym.info.elem_type).derive(unwrapped_ret_typ)`
`981`	`981`	`}`
`982`	`982`	`}`
	`983`	`+ } else {`
	`984`	`+ r_typ := g.resolve_return_type(node)`
	`985`	`+ if r_typ != ast.void_type && !r_typ.has_flag(.generic) {`
	`986`	+ // restore result/option flag, as `resolve_return_type` may clean them
	`987`	`+ if node.return_type.has_flag(.result) {`
	`988`	`+ ret_typ = r_typ.set_flag(.result)`
	`989`	`+ } else {`
	`990`	`+ ret_typ = r_typ.set_flag(.option)`
	`991`	`+ }`
	`992`	`+ }`
`983`	`993`	`}`
`984`	`994`	`}`
`985`	`995`	`mut styp := g.styp(ret_typ)`