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

cgen: fix wrong cname of anon fn(fix #20163) (#20164)

Browse Source
This commit is contained in:
shove 2023-12-14 04:32:52 +08:00 committed by GitHub
parent 4018a784b3
commit 0b12d647b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/v/gen/c/utils.v
View File

@ -113,9 +113,9 @@ fn (mut g Gen) fn_var_signature(return_type ast.Type, arg_types []ast.Type, var_
return sig return sig
} }
// generate anon fn cname, e.g. `anon_fn_void_int_string` // generate anon fn cname, e.g. `anon_fn_void_int_string`, `anon_fn_void_int_ptr_string`
fn (mut g Gen) anon_fn_cname(return_type ast.Type, arg_types []ast.Type) string { fn (mut g Gen) anon_fn_cname(return_type ast.Type, arg_types []ast.Type) string {
ret_styp := c_name(g.typ(return_type)) ret_styp := c_name(g.typ(return_type).replace('*', '_ptr'))
mut sig := '${ret_styp}_' mut sig := '${ret_styp}_'
for j, arg_typ in arg_types { for j, arg_typ in arg_types {
arg_sym := g.table.sym(arg_typ) arg_sym := g.table.sym(arg_typ)
@ -124,7 +124,7 @@ fn (mut g Gen) anon_fn_cname(return_type ast.Type, arg_types []ast.Type) string
arg_sig := g.anon_fn_cname(func.return_type, func.params.map(it.typ)) arg_sig := g.anon_fn_cname(func.return_type, func.params.map(it.typ))
sig += 'fnon_fn_' + arg_sig sig += 'fnon_fn_' + arg_sig
} else { } else {
arg_styp := c_name(g.typ(arg_typ)) arg_styp := c_name(g.typ(arg_typ).replace('*', '_ptr'))
sig += arg_styp sig += arg_styp
} }
if j < arg_types.len - 1 { if j < arg_types.len - 1 {

13
vlib/v/tests/anon_fn_test.v
View File

@ -41,3 +41,16 @@ fn test_anon_fn_returning_a_mut_parameter_should_act_the_same_as_normal_fn_retur
y := fnormal(mut b, 123) y := fnormal(mut b, 123)
assert a == b assert a == b
} }
// for issue 20163
struct Struct {}
fn test_spawn_anon_fn_with_closure_parameters_and_mut_ref_parameters() {
mut s := &Struct{}
a := 1
t := spawn fn [a] (mut s Struct) int {
return a
}(mut s)
assert t.wait() == 1
}