mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 22:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

cgen: optimise the generated code for returning literal values and option/result values (#22622)

Browse source
This commit is contained in:
Felipe Pena 2024-10-23 01:34:42 -03:00 • committed by GitHub
parent ea8ae7ba17
commit 4a2210f8d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
vlib/v/gen/c/cgen.v
View file

@ -5454,18 +5454,24 @@ fn (mut g Gen) return_stmt(node ast.Return) {
tmpvar := g.new_tmp_var() tmpvar := g.new_tmp_var()
g.defer_return_tmp_var = tmpvar g.defer_return_tmp_var = tmpvar
ret_typ := g.ret_styp(g.unwrap_generic(fn_ret_type)) ret_typ := g.ret_styp(g.unwrap_generic(fn_ret_type))
if node.exprs.len == 1 {
// `return fn_call_opt()` // `return fn_call_opt()`
if (fn_return_is_option || fn_return_is_result) && node.exprs[0] is ast.CallExpr if node.exprs.len == 1 && (fn_return_is_option || fn_return_is_result)
&& node.exprs[0].return_type == g.fn_decl.return_type && node.exprs[0] is ast.CallExpr && node.exprs[0].return_type == g.fn_decl.return_type
&& node.exprs[0].or_block.kind == .absent { && node.exprs[0].or_block.kind == .absent {
if g.defer_stmts.len > 0 {
g.write('${ret_typ} ${tmpvar} = ') g.write('${ret_typ} ${tmpvar} = ')
g.expr(node.exprs[0]) g.expr(node.exprs[0])
g.writeln(';') g.writeln(';')
g.write_defer_stmts_when_needed() g.write_defer_stmts_when_needed()
g.writeln('return ${tmpvar};') g.writeln('return ${tmpvar};')
return } else {
g.write_defer_stmts_when_needed()
g.write('return ')
g.expr(node.exprs[0])
g.writeln(';')
} }
return
} }
mut use_tmp_var := g.defer_stmts.len > 0 || g.defer_profile_code.len > 0 mut use_tmp_var := g.defer_stmts.len > 0 || g.defer_profile_code.len > 0
|| g.cur_lock.lockeds.len > 0 || g.cur_lock.lockeds.len > 0
@ -5758,7 +5764,7 @@ fn (mut g Gen) return_stmt(node ast.Return) {
// Don't use a tmp var if a variable is simply returned: `return x` // Don't use a tmp var if a variable is simply returned: `return x`
// Just in case of defer statements exists, that the return values cannot // Just in case of defer statements exists, that the return values cannot
// be modified. // be modified.
if node.exprs[0] !is ast.Ident || use_tmp_var { if use_tmp_var || !(node.exprs[0].is_literal() || node.exprs[0] is ast.Ident) {
use_tmp_var = true use_tmp_var = true
g.write('${ret_typ} ${tmpvar} = ') g.write('${ret_typ} ${tmpvar} = ')
} else { } else {

2
vlib/v/gen/c/testdata/embed_with_prod_and_several_decoders.c.must_have vendored
View file

@ -4,7 +4,7 @@
VV_LOCAL_SYMBOL void v__preludes__embed_file__zlib__init(void); VV_LOCAL_SYMBOL void v__preludes__embed_file__zlib__init(void);
VV_LOCAL_SYMBOL _result_Array_u8 v__preludes__embed_file__zlib__ZLibDecoder_decompress(v__preludes__embed_file__zlib__ZLibDecoder _d1, Array_u8 data) { VV_LOCAL_SYMBOL _result_Array_u8 v__preludes__embed_file__zlib__ZLibDecoder_decompress(v__preludes__embed_file__zlib__ZLibDecoder _d1, Array_u8 data) {
= compress__zlib__decompress(data); return compress__zlib__decompress(data);
res.compressed = v__embed_file__find_index_entry_by_path((voidptr)_v_embed_file_index, _SLIT("embed.vv"), _SLIT("zlib"))->data; res.compressed = v__embed_file__find_index_entry_by_path((voidptr)_v_embed_file_index, _SLIT("embed.vv"), _SLIT("zlib"))->data;
res.compression_type = _SLIT("zlib"); res.compression_type = _SLIT("zlib");