cgen: fix assign optional aliases of fixed array

yuyi98 · Dec 17, 2024 · 898c49b · 898c49b
1 parent 70edd21
commit 898c49b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/vlib/v/gen/c/assign.v b/vlib/v/gen/c/assign.v
@@ -492,11 +492,21 @@ fn (mut g Gen) assign_stmt(node_ ast.AssignStmt) {
 				g.write(' = ')
 				g.expr_with_opt(val, val_type, var_type)
 			} else if unaliased_right_sym.kind == .array_fixed && val is ast.CastExpr {
-				g.write('memcpy(')
-				g.expr(left)
-				g.write(', ')
-				g.expr(val)
-				g.writeln(', sizeof(${g.styp(var_type)}));')
+				if var_type.has_flag(.option) {
+					g.expr(left)
+					g.writeln('.state = 0;')
+					g.write('memcpy(')
+					g.expr(left)
+					g.write('.data, ')
+					g.expr(val)
+					g.writeln(', sizeof(${g.styp(var_type.clear_flag(.option))}));')
+				} else {
+					g.write('memcpy(')
+					g.expr(left)
+					g.write(', ')
+					g.expr(val)
+					g.writeln(', sizeof(${g.styp(var_type)}));')
+				}
 			} else {
 				mut v_var := ''
 				arr_typ := styp.trim('*')

diff --git a/vlib/v/tests/assign/assign_option_of_fixed_array_test.v b/vlib/v/tests/assign/assign_option_of_fixed_array_test.v
@@ -0,0 +1,8 @@
+type Addr = [4]u8
+
+fn test_assign_option_of_fixed_array() {
+	mut addr := ?Addr(none)
+	addr = Addr([u8(1), 2, 3, 4]!)
+	println(addr)
+	assert '${addr}' == 'Option(Addr([1, 2, 3, 4]))'
+}