From ab695faf0cc6c36b8cc4785211ff567a985b3dd6 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Sat, 6 Jun 2026 03:38:10 +0300 Subject: [PATCH] cgen: fix fixed array expression field assignment (fixes #27360) (#27359) --- vlib/v/gen/c/assign.v | 2 +- .../fixed_array_expr_field_assign_test.v | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 vlib/v/tests/fixed_array_expr_field_assign_test.v diff --git a/vlib/v/gen/c/assign.v b/vlib/v/gen/c/assign.v index 17d059f73..343407f39 100644 --- a/vlib/v/gen/c/assign.v +++ b/vlib/v/gen/c/assign.v @@ -1441,7 +1441,7 @@ fn (mut g Gen) assign_stmt(node_ ast.AssignStmt) { unaliased_right_sym := g.table.final_sym(unwrapped_val_type) unaliased_left_sym := g.table.final_sym(g.unwrap_generic(var_type)) is_fixed_array_var := unaliased_right_sym.kind == .array_fixed && val !is ast.ArrayInit - && (val in [ast.Ident, ast.IndexExpr, ast.CallExpr, ast.SelectorExpr, ast.ComptimeSelector, ast.DumpExpr, ast.InfixExpr] + && (val in [ast.Ident, ast.IndexExpr, ast.CallExpr, ast.SelectorExpr, ast.ComptimeSelector, ast.DumpExpr, ast.InfixExpr, ast.IfExpr, ast.MatchExpr] || (val is ast.CastExpr && val.expr !is ast.ArrayInit) || (val is ast.PrefixExpr && val.op == .arrow) || (val is ast.UnsafeExpr && val.expr in [ast.SelectorExpr, ast.Ident, ast.CallExpr])) diff --git a/vlib/v/tests/fixed_array_expr_field_assign_test.v b/vlib/v/tests/fixed_array_expr_field_assign_test.v new file mode 100644 index 000000000..3d18bef3e --- /dev/null +++ b/vlib/v/tests/fixed_array_expr_field_assign_test.v @@ -0,0 +1,38 @@ +const fixed_array_expr_hi = [u8(1), 2, 3, 4]! +const fixed_array_expr_lo = [u8(5), 6, 7, 8]! + +struct FixedArrayExprMesh { +mut: + highlight [4]u8 +} + +fn fixed_array_expr_set_if(mut mesh FixedArrayExprMesh, highlighted bool) { + mesh.highlight = if highlighted { fixed_array_expr_hi } else { fixed_array_expr_lo } +} + +fn fixed_array_expr_set_match(mut mesh FixedArrayExprMesh, highlighted bool) { + mesh.highlight = match highlighted { + true { fixed_array_expr_hi } + false { fixed_array_expr_lo } + } +} + +fn test_fixed_array_field_assign_from_if_expr() { + mut mesh := FixedArrayExprMesh{} + + fixed_array_expr_set_if(mut mesh, true) + assert mesh.highlight == fixed_array_expr_hi + + fixed_array_expr_set_if(mut mesh, false) + assert mesh.highlight == fixed_array_expr_lo +} + +fn test_fixed_array_field_assign_from_match_expr() { + mut mesh := FixedArrayExprMesh{} + + fixed_array_expr_set_match(mut mesh, true) + assert mesh.highlight == fixed_array_expr_hi + + fixed_array_expr_set_match(mut mesh, false) + assert mesh.highlight == fixed_array_expr_lo +} -- 2.39.5