Skip to content

Commit

Permalink
cgen: fix array insert for a variadic arg parameter (#20217)
Browse files Browse the repository at this point in the history
  • Loading branch information
yuyi98 authored Dec 19, 2023
1 parent ef03767 commit 93756d2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
3 changes: 2 additions & 1 deletion vlib/v/gen/c/array.v
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,8 @@ fn (mut g Gen) gen_array_insert(node ast.CallExpr) {
left_info := left_sym.info as ast.Array
elem_type_str := g.typ(left_info.elem_type)
arg2_sym := g.table.sym(node.args[1].typ)
is_arg2_array := arg2_sym.kind == .array && node.args[1].typ == node.left_type
is_arg2_array := arg2_sym.kind == .array
&& node.args[1].typ.clear_flag(.variadic) == node.left_type
noscan := g.check_noscan(left_info.elem_type)
addr := if node.left_type.is_ptr() { '' } else { '&' }
if is_arg2_array {
Expand Down
12 changes: 12 additions & 0 deletions vlib/v/tests/array_insert_variadic_arg_variable_test.v
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
fn foo(args ...string) []string {
mut v := ['a']
v.insert(1, ['b'])
v.insert(1, args)
return v
}

fn test_array_insert_variadic_arg_variable() {
ret := foo('b')
println(ret)
assert ret == ['a', 'b', 'b']
}

0 comments on commit 93756d2

Please sign in to comment.