Skip to content

Commit 511a644

Browse files
authored
cgen: fix codegen for array of option element auto eq a == [?int(none)] (#24504)
1 parent 1824b94 commit 511a644

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎vlib/v/gen/c/auto_eq_methods.v‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,13 @@ fn (mut g Gen) gen_array_equality_fn(left_type ast.Type) string {
408408
} else if elem.sym.kind == .function {
409409
fn_builder.writeln('\t\tif (*((voidptr*)((byte*)${left_data}+(i*${left_elem}))) != *((voidptr*)((byte*)${right_data}+(i*${right_elem})))) {')
410410
} else {
411-
fn_builder.writeln('\t\tif (*((${ptr_elem_styp}*)((byte*)${left_data}+(i*${left_elem}))) != *((${ptr_elem_styp}*)((byte*)${right_data}+(i*${right_elem})))) {')
411+
if elem.typ.has_flag(.option) {
412+
fn_builder.writeln('\t\t${ptr_elem_styp}* left = ((${ptr_elem_styp}*)${left_data})+(i*${left_elem});')
413+
fn_builder.writeln('\t\t${ptr_elem_styp}* right = ((${ptr_elem_styp}*)${right_data})+(i*${right_elem});')
414+
fn_builder.writeln('\t\tif (!(left->state == 2 && left->state == right->state) && memcmp(left->data, right->data, sizeof(${g.base_type(elem.typ)}))) {')
415+
} else {
416+
fn_builder.writeln('\t\tif (*((${ptr_elem_styp}*)((byte*)${left_data}+(i*${left_elem}))) != *((${ptr_elem_styp}*)((byte*)${right_data}+(i*${right_elem})))) {')
417+
}
412418
}
413419
fn_builder.writeln('\t\t\treturn false;')
414420
fn_builder.writeln('\t\t}')
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
fn test_main() {
2+
mut a := []?int{}
3+
a << none
4+
assert a == [?int(none)]
5+
}

0 commit comments

Comments
 (0)