cgen: fix option unwrap for fields of interface type (fixes #22930) (#…

…22931)
vlang · Nov 21, 2024 · e384e74 · e384e74
1 parent c2d96c3
commit e384e74
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -4059,7 +4059,8 @@ fn (mut g Gen) selector_expr(node ast.SelectorExpr) {
 							g.write('*')
 						}
 						cast_sym := g.table.sym(g.unwrap_generic(typ))
-						if field_sym.kind == .interface && cast_sym.kind == .interface {
+						if field_sym.kind == .interface && cast_sym.kind == .interface
+							&& !is_option_unwrap {
 							ptr := '*'.repeat(field.typ.nr_muls())
 							dot := if node.expr_type.is_ptr() { '->' } else { '.' }
 							g.write('I_${field_sym.cname}_as_I_${cast_sym.cname}(${ptr}${node.expr}${dot}${node.field_name}))')

diff --git a/vlib/v/tests/options/option_selector_unwrap_types_test.v b/vlib/v/tests/options/option_selector_unwrap_types_test.v
@@ -1,5 +1,9 @@
 type SumType = int | string
 
+interface Interface {
+	a int
+}
+
 struct Struct {
 	a int
 }
@@ -9,6 +13,7 @@ struct Foo {
 	b ?string
 	c ?SumType
 	d ?Struct
+	e ?Interface
 }
 
 fn test_main() {
@@ -19,6 +24,9 @@ fn test_main() {
 		d: Struct{
 			a: 123
 		}
+		e: Struct{
+			a: 456
+		}
 	}
 	if w.a != none {
 		dump(w.a)
@@ -44,4 +52,10 @@ fn test_main() {
 	} else {
 		assert false
 	}
+	if w.e != none {
+		dump(w.e)
+		assert w.e.a == 456
+	} else {
+		assert false
+	}
 }