diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v index 4fe780934bcf9e..e763c02a249dcc 100644 --- a/vlib/v/gen/c/fn.v +++ b/vlib/v/gen/c/fn.v @@ -1675,13 +1675,15 @@ fn (mut g Gen) method_call(node ast.CallExpr) { // if so, then instead of calling array_clone(&array_slice(...)) // call array_clone_static(array_slice(...)) mut is_range_slice := false - if node.name == 'clone' && node.receiver_type.is_ptr() && !left_type.is_ptr() { + if node.receiver_type.is_ptr() && !left_type.is_ptr() { if node.left is ast.IndexExpr { idx := node.left.index if idx is ast.RangeExpr { // expr is arr[range].clone() // use array_clone_static instead of array_clone - name = util.no_dots('${receiver_type_name}_${node.name}_static') + if node.name == 'clone' { + name = util.no_dots('${receiver_type_name}_${node.name}_static') + } is_range_slice = true } } @@ -1759,6 +1761,11 @@ fn (mut g Gen) method_call(node ast.CallExpr) { && g.typ(left_type) == g.typ(node.receiver_type)) { g.write('&') } + } else { + if node.name != 'clone' && !left_type.is_ptr() { + g.write('ADDR(${rec_cc_type}, ') + cast_n++ + } } } else if !node.receiver_type.is_ptr() && left_type.is_ptr() && node.name != 'str' && node.from_embed_types.len == 0 { diff --git a/vlib/v/tests/fns/method_call_on_rangeexpr_test.v b/vlib/v/tests/fns/method_call_on_rangeexpr_test.v index 0c62379556fa59..514b7d2725fc51 100644 --- a/vlib/v/tests/fns/method_call_on_rangeexpr_test.v +++ b/vlib/v/tests/fns/method_call_on_rangeexpr_test.v @@ -1,4 +1,4 @@ -type Buffer = []byte +type Buffer = []u8 pub fn (mut sb Buffer) vbytes() string { return sb[0..sb.len].a().str() @@ -9,7 +9,7 @@ pub fn (mut sb Buffer) a() Buffer { } fn test_main() { - mut b := Buffer([]byte{cap: 10}) + mut b := Buffer([]u8{cap: 10}) b << 1 b << 2 assert b.vbytes() == 'Buffer([1, 2])'