Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

checker: fix option checker arg validation for ptr passing on non expected ptr #21087

Merged
merged 10 commits into from
Mar 25, 2024
10 changes: 10 additions & 0 deletions vlib/v/checker/check_types.v
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,18 @@ fn (mut c Checker) check_expected_call_arg(got ast.Type, expected_ ast.Type, lan
return
}
} else {
if expected.has_flag(.option) {
got_is_ptr := got.is_ptr()
|| (arg.expr is ast.Ident && (arg.expr as ast.Ident).is_mut())
if (expected.is_ptr() && !got_is_ptr) || (!expected.is_ptr() && got.is_ptr()) {
got_typ_str, expected_typ_str := c.get_string_names_of(got, expected)
return error('cannot use `${got_typ_str}` as `${expected_typ_str}`')
}
}

exp_sym_idx := c.table.sym(expected).idx
got_sym_idx := c.table.sym(got).idx

if expected.is_ptr() && got.is_ptr() && exp_sym_idx != got_sym_idx
&& exp_sym_idx in [ast.u8_type_idx, ast.byteptr_type_idx]
&& got_sym_idx !in [ast.u8_type_idx, ast.byteptr_type_idx] {
Expand Down
7 changes: 7 additions & 0 deletions vlib/v/checker/tests/option_receive_ptr_err.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
vlib/v/checker/tests/option_receive_ptr_err.vv:14:23: error: cannot use `&MyStruct` as `?MyStruct` in argument 1 to `unwrap_option`
12 |
13 | fn wrap_unwrap_ptr(event_data &MyStruct) int {
14 | return unwrap_option(event_data)
| ~~~~~~~~~~
15 | }
16 |
21 changes: 21 additions & 0 deletions vlib/v/checker/tests/option_receive_ptr_err.vv
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
struct MyStruct {
x int
}

fn unwrap_option(event_data ?MyStruct) int {
if val := event_data {
return val.x
} else {
return 0
}
}

fn wrap_unwrap_ptr(event_data &MyStruct) int {
return unwrap_option(event_data)
}

fn main() {
data := MyStruct { x: 0 }
result := wrap_unwrap_ptr(&data)
assert data.x == result
}