From 511a64424f2e787dbddacf4235d0492b8ce55e87 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sun, 18 May 2025 02:44:05 -0300 Subject: [PATCH] cgen: fix codegen for array of option element auto eq `a == [?int(none)]` (#24504) --- vlib/v/gen/c/auto_eq_methods.v | 8 +++++++- vlib/v/tests/options/option_array_compare_test.v | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 vlib/v/tests/options/option_array_compare_test.v diff --git a/vlib/v/gen/c/auto_eq_methods.v b/vlib/v/gen/c/auto_eq_methods.v index 42189c025..309c7b5c5 100644 --- a/vlib/v/gen/c/auto_eq_methods.v +++ b/vlib/v/gen/c/auto_eq_methods.v @@ -408,7 +408,13 @@ fn (mut g Gen) gen_array_equality_fn(left_type ast.Type) string { } else if elem.sym.kind == .function { fn_builder.writeln('\t\tif (*((voidptr*)((byte*)${left_data}+(i*${left_elem}))) != *((voidptr*)((byte*)${right_data}+(i*${right_elem})))) {') } else { - fn_builder.writeln('\t\tif (*((${ptr_elem_styp}*)((byte*)${left_data}+(i*${left_elem}))) != *((${ptr_elem_styp}*)((byte*)${right_data}+(i*${right_elem})))) {') + if elem.typ.has_flag(.option) { + fn_builder.writeln('\t\t${ptr_elem_styp}* left = ((${ptr_elem_styp}*)${left_data})+(i*${left_elem});') + fn_builder.writeln('\t\t${ptr_elem_styp}* right = ((${ptr_elem_styp}*)${right_data})+(i*${right_elem});') + fn_builder.writeln('\t\tif (!(left->state == 2 && left->state == right->state) && memcmp(left->data, right->data, sizeof(${g.base_type(elem.typ)}))) {') + } else { + fn_builder.writeln('\t\tif (*((${ptr_elem_styp}*)((byte*)${left_data}+(i*${left_elem}))) != *((${ptr_elem_styp}*)((byte*)${right_data}+(i*${right_elem})))) {') + } } fn_builder.writeln('\t\t\treturn false;') fn_builder.writeln('\t\t}') diff --git a/vlib/v/tests/options/option_array_compare_test.v b/vlib/v/tests/options/option_array_compare_test.v new file mode 100644 index 000000000..7c9f7f3b7 --- /dev/null +++ b/vlib/v/tests/options/option_array_compare_test.v @@ -0,0 +1,5 @@ +fn test_main() { + mut a := []?int{} + a << none + assert a == [?int(none)] +} -- 2.39.5