cgen: fix short-circuiting of boolean expressions, when the right side calls array methods (fix #25398) (#25411)

dy-tea · web-flow · commit 42d5c0b2e723 · 2025-09-28T21:56:28.000+03:00
diff --git a/vlib/v/gen/c/if.v b/vlib/v/gen/c/if.v
@@ -62,7 +62,8 @@ fn (mut g Gen) need_tmp_var_in_expr(expr ast.Expr) bool {
 			if expr.is_method {
 				left_sym := g.table.sym(expr.receiver_type)
 				if left_sym.kind in [.array, .array_fixed, .map] {
-					return true
+					return expr.name !in ['contains', 'exists', 'len', 'cap', 'first', 'last',
+						'index', 'get']
 				}
 			}
 			if expr.or_block.kind != .absent {
diff --git a/vlib/v/gen/c/testdata/logical_and_short_circuit.must_have b/vlib/v/gen/c/testdata/logical_and_short_circuit.must_have
@@ -0,0 +1,24 @@
+VV_LOC void main__main(void) {
+	Array_int list = builtin__new_array_from_c_array_noscan(3, 3, sizeof(int), _MOV((int[3]){1, 2, 3}));
+	int index = 3;
+	if (index < list.len && (*(int*)builtin__array_get(list, index)) == 3) {
+		builtin__println(_S("Index is within bounds and value is 3"));
+	} else {
+		builtin__println(_S("Index is out of bounds or value is not 3"));
+	}
+	if (index < list.len && main__print_true((*(int*)builtin__array_get(list, index)))) {
+		builtin__println(_S("Index is within bounds"));
+	} else {
+		builtin__println(_S("Index is out of bounds"));
+	}
+	if (index < list.len && Array_int_contains(_const_main__other_list, (*(int*)builtin__array_get(list, index)))) {
+		builtin__println(_S("Index is within bounds and value is in other_list"));
+	} else {
+		builtin__println(_S("Index is out of bounds or value is not in other_list"));
+	}
+	if (index < list.len && (Array_int_contains(_const_main__other_list, (*(int*)builtin__array_get(list, index))) || Array_int_contains(_const_main__other_list, (*(int*)builtin__array_get(list, index))))) {
+		builtin__println(_S("Index is within bounds and value is in other_list"));
+	} else {
+		builtin__println(_S("Index is out of bounds or value is not in other_list"));
+	}
+}
diff --git a/vlib/v/gen/c/testdata/logical_and_short_circuit.out b/vlib/v/gen/c/testdata/logical_and_short_circuit.out
@@ -0,0 +1,4 @@
+Index is out of bounds or value is not 3
+Index is out of bounds
+Index is out of bounds or value is not in other_list
+Index is out of bounds or value is not in other_list
diff --git a/vlib/v/gen/c/testdata/logical_and_short_circuit.vv b/vlib/v/gen/c/testdata/logical_and_short_circuit.vv
@@ -0,0 +1,31 @@
+fn print_true(i int) bool {
+	println(i)
+	return true
+}
+
+const other_list = [3, 4]
+
+fn main() {
+	list := [1, 2, 3]
+	index := 3
+	if index < list.len && list[index] == 3 {
+		println('Index is within bounds and value is 3')
+	} else {
+		println('Index is out of bounds or value is not 3')
+	}
+	if index < list.len && print_true(list[index]) {
+		println('Index is within bounds')
+	} else {
+		println('Index is out of bounds')
+	}
+	if index < list.len && other_list.contains(list[index]) {
+		println('Index is within bounds and value is in other_list')
+	} else {
+		println('Index is out of bounds or value is not in other_list')
+	}
+	if index < list.len && (other_list.contains(list[index]) || other_list.contains(list[index])) {
+		println('Index is within bounds and value is in other_list')
+	} else {
+		println('Index is out of bounds or value is not in other_list')
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,8 @@ fn (mut g Gen) need_tmp_var_in_expr(expr ast.Expr) bool {`
`62`	`62`	`if expr.is_method {`
`63`	`63`	`left_sym := g.table.sym(expr.receiver_type)`
`64`	`64`	`if left_sym.kind in [.array, .array_fixed, .map] {`
`65`		`- return true`
	`65`	`+ return expr.name !in ['contains', 'exists', 'len', 'cap', 'first', 'last',`
	`66`	`+ 'index', 'get']`
`66`	`67`	`}`
`67`	`68`	`}`
`68`	`69`	`if expr.or_block.kind != .absent {`