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

cgen: minor optimization in for_in_array (#9127)

pull/9129/head
yuyi 2021-03-05 13:58:09 +08:00 committed by GitHub
parent f403056b23
commit f4c03e8ed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1371,22 +1371,32 @@ fn (mut g Gen) for_in_stmt(node ast.ForInStmt) {
g.writeln('// FOR IN array') g.writeln('// FOR IN array')
styp := g.typ(node.val_type) styp := g.typ(node.val_type)
val_sym := g.table.get_type_symbol(node.val_type) val_sym := g.table.get_type_symbol(node.val_type)
tmp := g.new_tmp_var() mut cond_var := ''
if node.cond is ast.Ident || node.cond is ast.SelectorExpr {
pos := g.out.len
g.expr(node.cond)
cond_var = g.out.after(pos)
g.out.go_back(cond_var.len)
cond_var = cond_var.trim_space()
} else {
cond_var = g.new_tmp_var()
g.write(g.typ(node.cond_type)) g.write(g.typ(node.cond_type))
g.write(' $tmp = ') g.write(' $cond_var = ')
g.expr(node.cond) g.expr(node.cond)
g.writeln(';') g.writeln(';')
}
i := if node.key_var in ['', '_'] { g.new_tmp_var() } else { node.key_var } i := if node.key_var in ['', '_'] { g.new_tmp_var() } else { node.key_var }
op_field := if node.cond_type.is_ptr() { '->' } else { '.' } + op_field := if node.cond_type.is_ptr() { '->' } else { '.' } +
if node.cond_type.share() == .shared_t { 'val.' } else { '' } if node.cond_type.share() == .shared_t { 'val.' } else { '' }
g.writeln('for (int $i = 0; $i < $tmp${op_field}len; ++$i) {') g.empty_line = true
g.writeln('for (int $i = 0; $i < $cond_var${op_field}len; ++$i) {')
if node.val_var != '_' { if node.val_var != '_' {
if val_sym.kind == .function { if val_sym.kind == .function {
g.write('\t') g.write('\t')
g.write_fn_ptr_decl(val_sym.info as table.FnType, c_name(node.val_var)) g.write_fn_ptr_decl(val_sym.info as table.FnType, c_name(node.val_var))
g.writeln(' = ((voidptr*)$tmp${op_field}data)[$i];') g.writeln(' = ((voidptr*)$cond_var${op_field}data)[$i];')
} else if val_sym.kind == .array_fixed && !node.val_is_mut { } else if val_sym.kind == .array_fixed && !node.val_is_mut {
right := '(($styp*)$tmp${op_field}data)[$i]' right := '(($styp*)$cond_var${op_field}data)[$i]'
g.writeln('\t$styp ${c_name(node.val_var)};') g.writeln('\t$styp ${c_name(node.val_var)};')
g.writeln('\tmemcpy(*($styp*)${c_name(node.val_var)}, (byte*)$right, sizeof($styp));') g.writeln('\tmemcpy(*($styp*)${c_name(node.val_var)}, (byte*)$right, sizeof($styp));')
} else { } else {
@ -1396,9 +1406,9 @@ fn (mut g Gen) for_in_stmt(node ast.ForInStmt) {
// `int* val = ((int**)arr.data)[i];` // `int* val = ((int**)arr.data)[i];`
// right := if node.val_is_mut { styp } else { styp + '*' } // right := if node.val_is_mut { styp } else { styp + '*' }
right := if node.val_is_mut { right := if node.val_is_mut {
'(($styp)$tmp${op_field}data) + $i' '(($styp)$cond_var${op_field}data) + $i'
} else { } else {
'(($styp*)$tmp${op_field}data)[$i]' '(($styp*)$cond_var${op_field}data)[$i]'
} }
g.writeln('\t$styp ${c_name(node.val_var)} = $right;') g.writeln('\t$styp ${c_name(node.val_var)} = $right;')
} }