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

cgen: fix map_set codegen for sumtype array variant with autofree (fix #12008) (#22553)

Browse Source
This commit is contained in:
Felipe Pena 2024-10-17 15:52:19 -03:00 committed by GitHub
parent ae04167c32
commit 8054808861
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3070,7 +3070,17 @@ fn (mut g Gen) gen_clone_assignment(var_type ast.Type, val ast.Expr, typ ast.Typ
if typ.share() == .shared_t {
g.write('(${shared_styp}*)__dup_shared_array(&(${shared_styp}){.mtx = {0}, .val =')
}
g.write(' array_clone_static_to_depth(')
is_sumtype := g.table.type_kind(var_type) == .sum_type
if is_sumtype {
variant_typ := g.typ(typ).replace('*', '')
fn_name := g.get_sumtype_casting_fn(typ, var_type)
g.write('${fn_name}(ADDR(${variant_typ}, array_clone_static_to_depth(')
if typ.is_ptr() {
g.write('*')
}
} else {
g.write(' array_clone_static_to_depth(')
}
g.expr(val)
if typ.share() == .shared_t {
g.write('->val')
@ -3081,6 +3091,9 @@ fn (mut g Gen) gen_clone_assignment(var_type ast.Type, val ast.Expr, typ ast.Typ
if typ.share() == .shared_t {
g.write('}, sizeof(${shared_styp}))')
}
if is_sumtype {
g.write('))')
}
} else if right_sym.kind == .string {
// `str1 = str2` => `str1 = str2.clone()`
if var_type.has_flag(.option) {

29
vlib/v/tests/sumtypes/sumtype_map_set_test.v Normal file
View File

@ -0,0 +1,29 @@
module main
pub type Value = f64 | []Value
fn test_no_ref() {
mut m := map[string]Value{}
var := Value([Value(1.0), Value(2.0), Value(3.0)])
arr := (var as []Value)
m['var'] = arr
dump(m)
if item := m['var'] {
assert (item as []Value)[1] == Value(2.0)
} else {
assert false
}
}
fn test_ref() {
mut m := map[string]Value{}
var := Value([Value(1.0), Value(2.0), Value(3.0)])
arr := &(var as []Value)
m['var'] = arr
dump(m)
if item := m['var'] {
assert (item as []Value)[1] == Value(2.0)
} else {
assert false
}
}