mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

cgen: fix shared struct method call (#15386)

Browse Source
This commit is contained in:
yuyi 2022-08-09 17:44:19 +08:00 committed by GitHub
parent 7be9963a41
commit d3aa7700c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/v/gen/c/fn.v
View File

@ -999,6 +999,7 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
g.write('${name}(')
}
}
is_node_name_in_first_last_repeat := node.name in ['first', 'last', 'repeat']
if node.receiver_type.is_ptr() && (!left_type.is_ptr() || left_type.has_flag(.variadic)
|| node.from_embed_types.len != 0
|| (left_type.has_flag(.shared_f) && node.name != 'str')) {
@ -1009,7 +1010,8 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
if !node.left.is_lvalue() {
g.write('ADDR($rec_cc_type, ')
has_cast = true
} else if node.name !in ['first', 'last', 'repeat'] {
} else if !is_node_name_in_first_last_repeat && !(left_type.has_flag(.shared_f)
&& left_type == node.receiver_type) {
g.write('&')
}
}
@ -1036,7 +1038,7 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
g.write('/*af receiver arg*/' + arg_name)
} else {
if left_sym.kind == .array && node.left.is_auto_deref_var()
&& node.name in ['first', 'last', 'repeat'] {
&& is_node_name_in_first_last_repeat {
g.write('*')
}
if node.left is ast.MapInit {
@ -1061,7 +1063,8 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
}
g.write(embed_name)
}
if left_type.has_flag(.shared_f) {
if left_type.has_flag(.shared_f)
&& (left_type != node.receiver_type || is_node_name_in_first_last_repeat) {
g.write('->val')
}
}

28
vlib/v/tests/shared_struct_method_call_test.v Normal file
View File

@ -0,0 +1,28 @@
module main
struct Aa {
mut:
b []int
}
fn append_ok(shared a Aa, new_b int) {
lock a {
a.b << new_b
}
}
fn (shared a Aa) append_fails(new_b int) {
lock a {
a.b << new_b
}
}
fn test_shared_struct_method_call() {
shared a := Aa{}
append_ok(shared a, 1)
a.append_fails(2)
rlock a {
println(a.b)
assert a.b == [1, 2]
}
}