vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: fix autofree of heap variables (#13823)

pull/13992/head
Daniel Oberhoff 2022-04-09 16:37:39 +02:00 committed by GitHub
parent 704e3c6e72
commit 58febe4607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2645,12 +2645,13 @@ fn (mut g Gen) autofree_variable(v ast.Var) {
g.autofree_var_call('string_free', v) g.autofree_var_call('string_free', v)
return return
} }
if sym.has_method('free') { if g.pref.experimental && v.typ.is_ptr() && sym.name.after('.')[0].is_capital() {
g.autofree_var_call(free_fn, v)
} else if g.pref.experimental && v.typ.is_ptr() && sym.name.after('.')[0].is_capital() {
// Free user reference types // Free user reference types
g.autofree_var_call('free', v) g.autofree_var_call('free', v)
} }
if sym.has_method('free') {
g.autofree_var_call(free_fn, v)
}
} }
fn (mut g Gen) autofree_var_call(free_fn_name string, v ast.Var) { fn (mut g Gen) autofree_var_call(free_fn_name string, v ast.Var) {
@ -2698,7 +2699,11 @@ fn (mut g Gen) autofree_var_call(free_fn_name string, v ast.Var) {
if v.typ == ast.error_type && !v.is_autofree_tmp { if v.typ == ast.error_type && !v.is_autofree_tmp {
return return
} }
af.writeln('\t${free_fn_name}(&${c_name(v.name)}); // autofreed var $g.cur_mod.name $g.is_builtin_mod') if v.is_auto_heap {
af.writeln('\t${free_fn_name}(${c_name(v.name)}); // autofreed heap var $g.cur_mod.name $g.is_builtin_mod')
} else {
af.writeln('\t${free_fn_name}(&${c_name(v.name)}); // autofreed var $g.cur_mod.name $g.is_builtin_mod')
}
} }
g.autofree_scope_stmts << af.str() g.autofree_scope_stmts << af.str()
} }