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

cgen: fix unwrap option ptr selector #23638

Merged
merged 3 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions vlib/v/gen/c/cgen.v
Original file line number Diff line number Diff line change
Expand Up @@ -4012,10 +4012,11 @@ fn (mut g Gen) selector_expr(node ast.SelectorExpr) {
mut sum_type_dot := '.'
mut field_typ := ast.void_type
mut is_option_unwrap := false
is_iface_or_sumtype := sym.kind in [.interface, .sum_type]
if f := g.table.find_field_with_embeds(sym, node.field_name) {
field_sym := g.table.sym(f.typ)
field_typ = f.typ
if sym.kind in [.interface, .sum_type] {
if is_iface_or_sumtype {
g.write('(*(')
}
is_option := field_typ.has_flag(.option)
Expand All @@ -4036,7 +4037,11 @@ fn (mut g Gen) selector_expr(node ast.SelectorExpr) {
for i, typ in field.smartcasts {
if i == 0 && (is_option_unwrap || nested_unwrap) {
deref := if g.inside_selector {
'*'.repeat(field.smartcasts.last().nr_muls() + 1)
if is_iface_or_sumtype {
'*'.repeat(field.smartcasts.last().nr_muls())
} else {
'*'.repeat(field.smartcasts.last().nr_muls() + 1)
}
} else if sym.kind == .interface && !typ.is_ptr()
&& field.orig_type.has_flag(.option) {
''
Expand Down Expand Up @@ -4138,7 +4143,7 @@ fn (mut g Gen) selector_expr(node ast.SelectorExpr) {
return
}
} else {
if sym.kind in [.interface, .sum_type] {
if is_iface_or_sumtype {
g.write('(*(')
}
}
Expand Down
39 changes: 39 additions & 0 deletions vlib/v/tests/options/option_ptr_unwrap_selector_test.v
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
module main

@[heap]
interface IGameObject {
mut:
name string
parent ?&IGameObject
children []&IGameObject
add_child(mut o IGameObject)
}

@[heap]
struct GameObject implements IGameObject {
mut:
name string
parent ?&IGameObject
children []&IGameObject
}

fn (mut gameobject GameObject) add_child(mut o IGameObject) {
o.parent = gameobject
gameobject.children << o
}

fn test_main() {
mut v1 := &GameObject{
name: 'v1'
}
mut v2 := &GameObject{
name: 'v2'
}
v1.add_child(mut v2)
for child in v1.children {
if child.parent != none {
eprintln('parent: ${child.parent.name}')
}
}
assert true
}
Loading