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

cgen: fix return if true { 0 } else { none } (fix #9005) (#9030)

pull/9035/head
yuyi 2021-03-01 20:56:07 +08:00 committed by GitHub
parent 83a77542e3
commit f9c8d3d25c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 125 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/v/checker/checker.v
View File

@ -4913,9 +4913,14 @@ pub fn (mut c Checker) if_expr(mut node ast.IfExpr) table.Type {
if branch.stmts.len > 0 && branch.stmts[branch.stmts.len - 1] is ast.ExprStmt { if branch.stmts.len > 0 && branch.stmts[branch.stmts.len - 1] is ast.ExprStmt {
mut last_expr := branch.stmts[branch.stmts.len - 1] as ast.ExprStmt mut last_expr := branch.stmts[branch.stmts.len - 1] as ast.ExprStmt
c.expected_type = former_expected_type c.expected_type = former_expected_type
if c.expected_type.has_flag(.optional) {
if node.typ == table.void_type {
node.is_expr = true
node.typ = c.expected_type
}
continue
}
last_expr.typ = c.expr(last_expr.expr) last_expr.typ = c.expr(last_expr.expr)
// if last_expr.typ != node.typ {
// if !c.check_types(node.typ, last_expr.typ) {
if !c.check_types(last_expr.typ, node.typ) { if !c.check_types(last_expr.typ, node.typ) {
if node.typ == table.void_type { if node.typ == table.void_type {
// first branch of if expression // first branch of if expression

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

@ -33,57 +33,57 @@ struct Gen {
pref &pref.Preferences pref &pref.Preferences
module_built string module_built string
mut: mut:
table &table.Table table &table.Table
out strings.Builder out strings.Builder
cheaders strings.Builder cheaders strings.Builder
includes strings.Builder // all C #includes required by V modules includes strings.Builder // all C #includes required by V modules
typedefs strings.Builder typedefs strings.Builder
typedefs2 strings.Builder typedefs2 strings.Builder
type_definitions strings.Builder // typedefs, defines etc (everything that goes to the top of the file) type_definitions strings.Builder // typedefs, defines etc (everything that goes to the top of the file)
definitions strings.Builder // typedefs, defines etc (everything that goes to the top of the file) definitions strings.Builder // typedefs, defines etc (everything that goes to the top of the file)
inits map[string]strings.Builder // contents of `void _vinit/2{}` inits map[string]strings.Builder // contents of `void _vinit/2{}`
cleanups map[string]strings.Builder // contents of `void _vcleanup(){}` cleanups map[string]strings.Builder // contents of `void _vcleanup(){}`
gowrappers strings.Builder // all go callsite wrappers gowrappers strings.Builder // all go callsite wrappers
stringliterals strings.Builder // all string literals (they depend on tos3() beeing defined stringliterals strings.Builder // all string literals (they depend on tos3() beeing defined
auto_str_funcs strings.Builder // function bodies of all auto generated _str funcs auto_str_funcs strings.Builder // function bodies of all auto generated _str funcs
comptime_defines strings.Builder // custom defines, given by -d/-define flags on the CLI comptime_defines strings.Builder // custom defines, given by -d/-define flags on the CLI
pcs_declarations strings.Builder // -prof profile counter declarations for each function pcs_declarations strings.Builder // -prof profile counter declarations for each function
hotcode_definitions strings.Builder // -live declarations & functions hotcode_definitions strings.Builder // -live declarations & functions
embedded_data strings.Builder // data to embed in the executable/binary embedded_data strings.Builder // data to embed in the executable/binary
shared_types strings.Builder // shared/lock types shared_types strings.Builder // shared/lock types
shared_functions strings.Builder // shared constructors shared_functions strings.Builder // shared constructors
channel_definitions strings.Builder // channel related code channel_definitions strings.Builder // channel related code
options_typedefs strings.Builder // Option typedefs options_typedefs strings.Builder // Option typedefs
options strings.Builder // `Option_xxxx` types options strings.Builder // `Option_xxxx` types
json_forward_decls strings.Builder // json type forward decls json_forward_decls strings.Builder // json type forward decls
enum_typedefs strings.Builder // enum types enum_typedefs strings.Builder // enum types
sql_buf strings.Builder // for writing exprs to args via `sqlite3_bind_int()` etc sql_buf strings.Builder // for writing exprs to args via `sqlite3_bind_int()` etc
file ast.File file ast.File
fn_decl &ast.FnDecl // pointer to the FnDecl we are currently inside otherwise 0 fn_decl &ast.FnDecl // pointer to the FnDecl we are currently inside otherwise 0
last_fn_c_name string last_fn_c_name string
tmp_count int // counter for unique tmp vars (_tmp1, tmp2 etc) tmp_count int // counter for unique tmp vars (_tmp1, tmp2 etc)
tmp_count2 int // a separate tmp var counter for autofree fn calls tmp_count2 int // a separate tmp var counter for autofree fn calls
is_c_call bool // e.g. `C.printf("v")` is_c_call bool // e.g. `C.printf("v")`
is_assign_lhs bool // inside left part of assign expr (for array_set(), etc) is_assign_lhs bool // inside left part of assign expr (for array_set(), etc)
discard_or_result bool // do not safe last ExprStmt of `or` block in tmp variable to defer ongoing expr usage discard_or_result bool // do not safe last ExprStmt of `or` block in tmp variable to defer ongoing expr usage
is_void_expr_stmt bool // ExprStmt whos result is discarded is_void_expr_stmt bool // ExprStmt whos result is discarded
is_array_set bool is_array_set bool
is_amp bool // for `&Foo{}` to merge PrefixExpr `&` and StructInit `Foo{}`; also for `&byte(0)` etc is_amp bool // for `&Foo{}` to merge PrefixExpr `&` and StructInit `Foo{}`; also for `&byte(0)` etc
is_sql bool // Inside `sql db{}` statement, generating sql instead of C (e.g. `and` instead of `&&` etc) is_sql bool // Inside `sql db{}` statement, generating sql instead of C (e.g. `and` instead of `&&` etc)
is_shared bool // for initialization of hidden mutex in `[rw]shared` literals is_shared bool // for initialization of hidden mutex in `[rw]shared` literals
is_vlines_enabled bool // is it safe to generate #line directives when -g is passed is_vlines_enabled bool // is it safe to generate #line directives when -g is passed
array_set_pos int array_set_pos int
vlines_path string // set to the proper path for generating #line directives vlines_path string // set to the proper path for generating #line directives
optionals []string // to avoid duplicates TODO perf, use map optionals []string // to avoid duplicates TODO perf, use map
chan_pop_optionals []string // types for `x := <-ch or {...}` chan_pop_optionals []string // types for `x := <-ch or {...}`
chan_push_optionals []string // types for `ch <- x or {...}` chan_push_optionals []string // types for `ch <- x or {...}`
shareds []int // types with hidden mutex for which decl has been emitted shareds []int // types with hidden mutex for which decl has been emitted
inside_ternary int // ?: comma separated statements on a single line inside_ternary int // ?: comma separated statements on a single line
inside_map_postfix bool // inside map++/-- postfix expr inside_map_postfix bool // inside map++/-- postfix expr
inside_map_infix bool // inside map<</+=/-= infix expr inside_map_infix bool // inside map<</+=/-= infix expr
inside_map_index bool inside_map_index bool
inside_opt_data bool inside_opt_data bool
// inside_if_expr bool inside_if_optional bool
ternary_names map[string]string ternary_names map[string]string
ternary_level_names map[string][]string ternary_level_names map[string][]string
stmt_path_pos []int // positions of each statement start, for inserting C statements before the current statement stmt_path_pos []int // positions of each statement start, for inserting C statements before the current statement
@ -913,11 +913,40 @@ fn (mut g Gen) stmts_with_tmp_var(stmts []ast.Stmt, tmp_var string) {
for i, stmt in stmts { for i, stmt in stmts {
if i == stmts.len - 1 && tmp_var != '' { if i == stmts.len - 1 && tmp_var != '' {
// Handle if expressions, set the value of the last expression to the temp var. // Handle if expressions, set the value of the last expression to the temp var.
g.stmt_path_pos << g.out.len if g.inside_if_optional {
g.skip_stmt_pos = true g.stmt_path_pos << g.out.len
g.write('$tmp_var = ') g.skip_stmt_pos = true
if stmt is ast.ExprStmt {
sym := g.table.get_type_symbol(stmt.typ)
if sym.name in ['Option', 'Option2'] || stmt.expr is ast.None {
tmp := g.new_tmp_var()
g.write('Option2 $tmp = ')
g.expr(stmt.expr)
g.writeln(';')
g.writeln('memcpy(&$tmp_var, &$tmp, sizeof(Option2));')
} else {
mut styp := g.base_type(stmt.typ)
$if tinyc && x32 && windows {
if stmt.typ == table.int_literal_type {
styp = 'int'
} else if stmt.typ == table.float_literal_type {
styp = 'f64'
}
}
g.write('opt_ok(&($styp[]) { ')
g.stmt(stmt)
g.writeln(' }, (Option2*)(&$tmp_var), sizeof($styp));')
}
}
} else {
g.stmt_path_pos << g.out.len
g.skip_stmt_pos = true
g.write('$tmp_var = ')
g.stmt(stmt)
}
} else {
g.stmt(stmt)
} }
g.stmt(stmt)
g.skip_stmt_pos = false g.skip_stmt_pos = false
if g.inside_ternary > 0 && i < stmts.len - 1 { if g.inside_ternary > 0 && i < stmts.len - 1 {
g.write(',') g.write(',')
@ -1076,7 +1105,8 @@ fn (mut g Gen) stmt(node ast.Stmt) {
// if af { // if af {
// g.autofree_call_postgen() // g.autofree_call_postgen()
// } // }
if g.inside_ternary == 0 && !node.is_expr && node.expr !is ast.IfExpr { if g.inside_ternary == 0 && !g.inside_if_optional && !node.is_expr
&& node.expr !is ast.IfExpr {
g.writeln(';') g.writeln(';')
} }
} }
@ -4039,7 +4069,7 @@ fn (mut g Gen) concat_expr(node ast.ConcatExpr) {
fn (mut g Gen) need_tmp_var_in_if(node ast.IfExpr) bool { fn (mut g Gen) need_tmp_var_in_if(node ast.IfExpr) bool {
if node.is_expr && g.inside_ternary == 0 { if node.is_expr && g.inside_ternary == 0 {
if g.is_autofree { if g.is_autofree || node.typ.has_flag(.optional) {
return true return true
} }
for branch in node.branches { for branch in node.branches {
@ -4076,6 +4106,9 @@ fn (mut g Gen) if_expr(node ast.IfExpr) {
tmp := if needs_tmp_var { g.new_tmp_var() } else { '' } tmp := if needs_tmp_var { g.new_tmp_var() } else { '' }
mut cur_line := '' mut cur_line := ''
if needs_tmp_var { if needs_tmp_var {
if node.typ.has_flag(.optional) {
g.inside_if_optional = true
}
g.write('/*experimental if expr*/') g.write('/*experimental if expr*/')
styp := g.typ(node.typ) styp := g.typ(node.typ)
// g.insert_before_stmt('$styp $tmp;') // g.insert_before_stmt('$styp $tmp;')
@ -4181,6 +4214,9 @@ fn (mut g Gen) if_expr(node ast.IfExpr) {
// g.writeln('$cur_line $tmp; /*Z*/') // g.writeln('$cur_line $tmp; /*Z*/')
g.write('$cur_line $tmp /*Z*/') g.write('$cur_line $tmp /*Z*/')
} }
if node.typ.has_flag(.optional) {
g.inside_if_optional = false
}
} }
fn (mut g Gen) index_expr(node ast.IndexExpr) { fn (mut g Gen) index_expr(node ast.IndexExpr) {

25
vlib/v/tests/if_expr_of_optional_test.v 100644
View File

@ -0,0 +1,25 @@
fn foo1() ?int {
return if true { 0 } else { none }
}
fn foo2() ?int {
return if true { 1 } else { error('foo2 error') }
}
fn foo3() ?int {
return if true { 2 } else { 0 }
}
fn test_if_expr_of_optional() {
a1 := foo1() or { panic('error') }
println(a1)
assert a1 == 0
a2 := foo2() or { panic('error') }
println(a2)
assert a2 == 1
a3 := foo3() or { panic('error') }
println(a3)
assert a3 == 2
}