TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-10 07:47:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

checker: remove redundant callexpr c.expr(mut node.left) rechecks for ast.CallExpr (fix #24353) (#24380)

Browse Source
This commit is contained in:
Felipe Pena 2025-05-01 09:55:32 -03:00 committed by GitHub
parent 496c017175
commit 27e4b0278b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/v/checker/fn.v
View File

@ -709,6 +709,7 @@ fn (mut c Checker) call_expr(mut node ast.CallExpr) ast.Type {
old_inside_fn_arg := c.inside_fn_arg old_inside_fn_arg := c.inside_fn_arg
c.inside_fn_arg = true c.inside_fn_arg = true
mut continue_check := true mut continue_check := true
node.left_type = left_type
// Now call `method_call` or `fn_call` for specific checks. // Now call `method_call` or `fn_call` for specific checks.
typ := if node.is_method { typ := if node.is_method {
c.method_call(mut node, mut continue_check) c.method_call(mut node, mut continue_check)
@ -1020,7 +1021,6 @@ fn (mut c Checker) fn_call(mut node ast.CallExpr, mut continue_check &bool) ast.
if node.left is ast.AnonFn { if node.left is ast.AnonFn {
// it was set to anon for checker errors, clear for gen // it was set to anon for checker errors, clear for gen
node.name = '' node.name = ''
c.expr(mut node.left)
left := node.left as ast.AnonFn left := node.left as ast.AnonFn
if left.typ != ast.no_type { if left.typ != ast.no_type {
anon_fn_sym := c.table.sym(left.typ) anon_fn_sym := c.table.sym(left.typ)
@ -1039,7 +1039,6 @@ fn (mut c Checker) fn_call(mut node ast.CallExpr, mut continue_check &bool) ast.
} }
} }
if !found && node.left is ast.IndexExpr { if !found && node.left is ast.IndexExpr {
c.expr(mut node.left)
left := node.left as ast.IndexExpr left := node.left as ast.IndexExpr
sym := c.table.final_sym(left.left_type) sym := c.table.final_sym(left.left_type)
if sym.info is ast.Array { if sym.info is ast.Array {
@ -1077,7 +1076,6 @@ fn (mut c Checker) fn_call(mut node ast.CallExpr, mut continue_check &bool) ast.
} }
} }
if !found && node.left is ast.CallExpr { if !found && node.left is ast.CallExpr {
c.expr(mut node.left)
left := node.left as ast.CallExpr left := node.left as ast.CallExpr
if left.return_type != 0 { if left.return_type != 0 {
sym := c.table.sym(left.return_type) sym := c.table.sym(left.return_type)
@ -1984,7 +1982,7 @@ fn (mut c Checker) method_call(mut node ast.CallExpr, mut continue_check &bool)
} }
} }
} }
left_type := c.expr(mut node.left) left_type := node.left_type
if left_type == ast.void_type { if left_type == ast.void_type {
// c.error('cannot call a method using an invalid expression', node.pos) // c.error('cannot call a method using an invalid expression', node.pos)
continue_check = false continue_check = false

7
vlib/v/checker/tests/generics_struct_init_err.out
View File

@ -5,13 +5,6 @@ vlib/v/checker/tests/generics_struct_init_err.vv:14:2: notice: uninitialized `fn
| ~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~~
15 | } 15 | }
16 | 16 |
vlib/v/checker/tests/generics_struct_init_err.vv:58:8: error: cannot initialize builtin type `FnHolder1[neg]`
56 | ret = holder_call_12(neg, 3)
57 | assert ret == -3
58 | ret = FnHolder1{neg}.call(4)
| ~~~~~~~~~~~~~~
59 | assert ret == -4
60 |
vlib/v/checker/tests/generics_struct_init_err.vv:67:8: error: could not infer generic type `T` in generic struct `FnHolder2[T]` vlib/v/checker/tests/generics_struct_init_err.vv:67:8: error: could not infer generic type `T` in generic struct `FnHolder2[T]`
65 | ret = holder_call_22(neg, 5) 65 | ret = holder_call_22(neg, 5)
66 | assert ret == -5 66 | assert ret == -5

2
vlib/v/checker/tests/void_method_call.out
View File

@ -1,4 +1,4 @@
vlib/v/checker/tests/void_method_call.vv:5:14: cgen error: checker bug; CallExpr.left_type is 0 in method_call vlib/v/checker/tests/void_method_call.vv:5:14: cgen error: checker bug; CallExpr.receiver_type is 0 in method_call
3 | 3 |
4 | fn main() { 4 | fn main() {
5 | simple_fn().method() 5 | simple_fn().method()

42
vlib/v/tests/fns/call_nested_test.v Normal file
View File

@ -0,0 +1,42 @@
module main
@[heap]
struct MyStruct {
a int
}
fn (m &MyStruct) set(s string) !&MyStruct {
return m
}
fn test_main() {
mut m := MyStruct{}
x := m.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
.set('2')!
dump(x)
}