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

cgen: fix autostr for interface with circular type (fix #23022) (#23026)

Browse Source
This commit is contained in:
Felipe Pena 2024-12-01 06:21:26 -03:00 committed by GitHub
parent 40dc775974
commit e421cb2bc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vlib/v/gen/c/auto_str_methods.v
View File

@ -420,17 +420,22 @@ fn (mut g Gen) gen_str_for_interface(info ast.Interface, styp string, typ_str st
fn_builder.write_string2('\tif (x._typ == _${styp}_${sub_sym.cname}_index)',
' return ${res};')
} else {
mut val := '${func_name}(${deref}(${sub_sym.cname}*)x._${sub_sym.cname}'
if should_use_indent_func(sub_sym.kind) && !sym_has_str_method {
val += ', indent_count'
if !(sub_sym.kind == .array && g.table.sym(g.table.value_type(typ)).cname == styp) {
mut val := '${func_name}(${deref}(${sub_sym.cname}*)x._${sub_sym.cname}'
if should_use_indent_func(sub_sym.kind) && !sym_has_str_method {
val += ', indent_count'
}
val += ')'
res := 'str_intp(2, _MOV((StrIntpData[]){
{_SLIT("${clean_interface_v_type_name}("), ${si_s_code}, {.d_s = ${val}}},
{_SLIT(")"), 0, {.d_c = 0 }}
}))'
fn_builder.write_string2('\tif (x._typ == _${styp}_${sub_sym.cname}_index)',
' return ${res};\n')
} else {
fn_builder.write_string2('\tif (x._typ == _${styp}_${sub_sym.cname}_index)',
' return _SLIT("<circular>");\n')
}
val += ')'
res := 'str_intp(2, _MOV((StrIntpData[]){
{_SLIT("${clean_interface_v_type_name}("), ${si_s_code}, {.d_s = ${val}}},
{_SLIT(")"), 0, {.d_c = 0 }}
}))'
fn_builder.write_string2('\tif (x._typ == _${styp}_${sub_sym.cname}_index)',
' return ${res};\n')
}
}
fn_builder.writeln('\treturn _SLIT("unknown interface value");')

10
vlib/v/tests/printing/dump_interface_circular_test.v Normal file
View File

@ -0,0 +1,10 @@
interface Any {}
fn test_main() {
mut a := []Any{}
a.insert(0, Any(5))
a.insert(1, Any(5.0))
a.insert(2, Any(a[0]))
a.insert(3, Any(a)) // Terminated by signal 11 (SIGSEGV)
assert dump('${a}') == '[Any(5), Any(5.0), Any(5), <circular>]'
}