cgen: fix generic name handling for struct generic (fix #24530) (#24565)

felipensp · web-flow · commit c91cb876714e · 2025-05-29T10:51:17.000+03:00
diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v
@@ -561,6 +561,7 @@ fn (mut g Gen) c_fn_name(node &ast.FnDecl) string {
 
 	if node.generic_names.len > 0 {
 		name = g.generic_fn_name(g.cur_concrete_types, name)
+		name = name.replace_each(c_fn_name_escape_seq)
 	}
 
 	if g.pref.translated || g.file.is_translated || node.is_file_translated {
@@ -753,7 +754,10 @@ fn (mut g Gen) fn_decl_params(params []ast.Param, scope &ast.Scope, is_variadic
 			typ = g.table.sym(typ).array_info().elem_type.set_flag(.variadic)
 		}
 		param_type_sym := g.table.sym(typ)
-		mut param_type_name := g.styp(typ).replace_each(c_fn_name_escape_seq)
+		mut param_type_name := g.styp(typ)
+		if param.typ.has_flag(.generic) {
+			param_type_name = param_type_name.replace_each(c_fn_name_escape_seq)
+		}
 		if param_type_sym.kind == .function && !typ.has_flag(.option) {
 			info := param_type_sym.info as ast.FnType
 			func := info.func
@@ -2012,6 +2016,7 @@ fn (mut g Gen) fn_call(node ast.CallExpr) {
 					}
 				}
 				name = g.generic_fn_name(concrete_types, name)
+				name = name.replace_each(c_fn_name_escape_seq)
 			}
 		}
 	}
diff --git a/vlib/v/tests/generics/generic_fn_struct_test.v b/vlib/v/tests/generics/generic_fn_struct_test.v
@@ -0,0 +1,23 @@
+module main
+
+struct People[T] {
+	raw T
+}
+
+struct Man {
+	name string
+}
+
+fn test_main() {
+	m1 := Man{
+		name: 'Tom'
+	}
+	gen1(m1)
+}
+
+fn gen1[T](m T) {
+	gen2[People[T]]()
+}
+
+fn gen2[T]() {
+}

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,7 @@ fn (mut g Gen) c_fn_name(node &ast.FnDecl) string {`
`561`	`561`
`562`	`562`	`if node.generic_names.len > 0 {`
`563`	`563`	`name = g.generic_fn_name(g.cur_concrete_types, name)`
	`564`	`+ name = name.replace_each(c_fn_name_escape_seq)`
`564`	`565`	`}`
`565`	`566`
`566`	`567`	`if g.pref.translated \|\| g.file.is_translated \|\| node.is_file_translated {`
`@@ -753,7 +754,10 @@ fn (mut g Gen) fn_decl_params(params []ast.Param, scope &ast.Scope, is_variadic`
`753`	`754`	`typ = g.table.sym(typ).array_info().elem_type.set_flag(.variadic)`
`754`	`755`	`}`
`755`	`756`	`param_type_sym := g.table.sym(typ)`
`756`		`- mut param_type_name := g.styp(typ).replace_each(c_fn_name_escape_seq)`
	`757`	`+ mut param_type_name := g.styp(typ)`
	`758`	`+ if param.typ.has_flag(.generic) {`
	`759`	`+ param_type_name = param_type_name.replace_each(c_fn_name_escape_seq)`
	`760`	`+ }`
`757`	`761`	`if param_type_sym.kind == .function && !typ.has_flag(.option) {`
`758`	`762`	`info := param_type_sym.info as ast.FnType`
`759`	`763`	`func := info.func`
`@@ -2012,6 +2016,7 @@ fn (mut g Gen) fn_call(node ast.CallExpr) {`
`2012`	`2016`	`}`
`2013`	`2017`	`}`
`2014`	`2018`	`name = g.generic_fn_name(concrete_types, name)`
	`2019`	`+ name = name.replace_each(c_fn_name_escape_seq)`
`2015`	`2020`	`}`
`2016`	`2021`	`}`
`2017`	`2022`	`}`