TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 09:25:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

cgen: fix interface method list ordering to make test buildable with g++ (fix #23701) (#23870)

Browse Source
This commit is contained in:
Felipe Pena 2025-03-05 14:16:25 -03:00 committed by GitHub
parent e9a4312491
commit b60966cd10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/v/gen/c/cgen.v
View File

@ -7533,7 +7533,8 @@ fn (mut g Gen) interface_table() string {
methods_struct_name := 'struct _${interface_name}_interface_methods' methods_struct_name := 'struct _${interface_name}_interface_methods'
mut methods_struct_def := strings.new_builder(100) mut methods_struct_def := strings.new_builder(100)
methods_struct_def.writeln('${methods_struct_name} {') methods_struct_def.writeln('${methods_struct_name} {')
inter_methods := inter_info.get_methods() mut inter_methods := inter_info.get_methods()
inter_methods.sort(a < b)
mut methodidx := map[string]int{} mut methodidx := map[string]int{}
for k, method_name in inter_methods { for k, method_name in inter_methods {
method := isym.find_method_with_generic_parent(method_name) or { continue } method := isym.find_method_with_generic_parent(method_name) or { continue }
@ -7664,7 +7665,9 @@ static inline __shared__${interface_name} ${shared_fn_name}(__shared__${cctype}*
methods_struct.writeln('\t{') methods_struct.writeln('\t{')
} }
if st == ast.voidptr_type || st == ast.nil_type { if st == ast.voidptr_type || st == ast.nil_type {
for mname, _ in methodidx { mut mnames := methodidx.keys()
mnames.sort(a < b)
for mname in mnames {
if g.pref.build_mode != .build_module { if g.pref.build_mode != .build_module {
methods_struct.writeln('\t\t._method_${c_fn_name(mname)} = (void*) 0,') methods_struct.writeln('\t\t._method_${c_fn_name(mname)} = (void*) 0,')
} }
@ -7721,7 +7724,9 @@ static inline __shared__${interface_name} ${shared_fn_name}(__shared__${cctype}*
} }
} }
for method in methods { mut ordered_methods := methods.clone()
ordered_methods.sort(a.name < b.name)
for method in ordered_methods {
mut name := method.name mut name := method.name
if method.generic_names.len > 0 && inter_info.parent_type.has_flag(.generic) { if method.generic_names.len > 0 && inter_info.parent_type.has_flag(.generic) {
parent_sym := g.table.sym(inter_info.parent_type) parent_sym := g.table.sym(inter_info.parent_type)

18
vlib/v/gen/c/testdata/iface_method_order.c.must_have vendored Normal file
View File

@ -0,0 +1,18 @@
struct _main__Foo_interface_methods {
void (*_method_a)(void* _);
void (*_method_b)(void* _);
};
struct _main__Foo_interface_methods main__Foo_name_table[3] = {
{
._method_a = (void*) main__Bar_a_Interface_main__Foo_method_wrapper,
._method_b = (void*) main__Bar_b_Interface_main__Foo_method_wrapper,
},
{
._method_a = (void*) 0,
._method_b = (void*) 0,
},
{
._method_a = (void*) main__Baz_a_Interface_main__Foo_method_wrapper,
._method_b = (void*) main__Baz_b_Interface_main__Foo_method_wrapper,
},
};

18
vlib/v/gen/c/testdata/iface_method_order.vv vendored Normal file
View File

@ -0,0 +1,18 @@
interface Foo {
a()
b()
}
struct Bar implements Foo {
}
fn (b Bar) b() {}
fn (b Bar) a() {}
struct Baz implements Foo {
}
fn (b Baz) b() {}
fn (b Baz) a() {}