From 6c1085a4f05d7a7de19f0f526efdd30fa30d2efb Mon Sep 17 00:00:00 2001 From: Dylan Donnell Date: Sun, 24 Aug 2025 23:41:21 +0200 Subject: [PATCH] cgen: fix generic_fn_name generating incorrect names for C structs --- vlib/v/gen/c/cgen.v | 3 ++- vlib/v/tests/generics/foo.h | 9 +++++++++ .../v/tests/generics/generic_struct_cstruct_test.v | 14 ++++++++++++++ vlib/v/tests/generics/v.mod | 0 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 vlib/v/tests/generics/foo.h create mode 100644 vlib/v/tests/generics/generic_struct_cstruct_test.v create mode 100644 vlib/v/tests/generics/v.mod diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 5fa5de541e..9868fac160 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -1271,7 +1271,8 @@ fn (mut g Gen) generic_fn_name(types []ast.Type, before string) string { // `foo[int]()` => `foo_T_int()` mut name := before + '_T' for typ in types { - name += '_' + strings.repeat_string('__ptr__', typ.nr_muls()) + g.styp(typ.set_nr_muls(0)) + name += '_' + strings.repeat_string('__ptr__', typ.nr_muls()) + + g.styp(typ.set_nr_muls(0)).replace(' ', '_') } return name } diff --git a/vlib/v/tests/generics/foo.h b/vlib/v/tests/generics/foo.h new file mode 100644 index 0000000000..9db679bfcd --- /dev/null +++ b/vlib/v/tests/generics/foo.h @@ -0,0 +1,9 @@ +// foo.h +#ifndef TEST_H +#define TEST_H + +struct foo { + int a; +}; + +#endif diff --git a/vlib/v/tests/generics/generic_struct_cstruct_test.v b/vlib/v/tests/generics/generic_struct_cstruct_test.v new file mode 100644 index 0000000000..a4d6067673 --- /dev/null +++ b/vlib/v/tests/generics/generic_struct_cstruct_test.v @@ -0,0 +1,14 @@ +#insert "@VMODROOT/foo.h" + +struct C.foo { + a int +} + +fn ref[T](x T) &T { + return &x +} + +fn test_main() { + a := C.foo{} + b := ref(a) +} diff --git a/vlib/v/tests/generics/v.mod b/vlib/v/tests/generics/v.mod new file mode 100644 index 0000000000..e69de29bb2