diff --git a/src-self-hosted/translate_c.zig b/src-self-hosted/translate_c.zig index c821eb1ac3..bda152f134 100644 --- a/src-self-hosted/translate_c.zig +++ b/src-self-hosted/translate_c.zig @@ -1293,7 +1293,22 @@ fn transBinaryOperator( } const rhs_node = try transExpr(rp, scope, ZigClangBinaryOperator_getRHS(stmt), .used, .r_value); - return transCreateNodeInfixOp(rp, scope, lhs_node, op_id, op_token, rhs_node, result_used, true); + + const lhs = if (isBoolRes(lhs_node)) init: { + const cast_node = try transCreateNodeBuiltinFnCall(rp.c, "@boolToInt"); + try cast_node.params.push(lhs_node); + cast_node.rparen_token = try appendToken(rp.c, .RParen, ")"); + break :init &cast_node.base; + } else lhs_node; + + const rhs = if (isBoolRes(rhs_node)) init: { + const cast_node = try transCreateNodeBuiltinFnCall(rp.c, "@boolToInt"); + try cast_node.params.push(rhs_node); + cast_node.rparen_token = try appendToken(rp.c, .RParen, ")"); + break :init &cast_node.base; + } else rhs_node; + + return transCreateNodeInfixOp(rp, scope, lhs, op_id, op_token, rhs, result_used, true); } fn transCompoundStmtInline( diff --git a/test/run_translated_c.zig b/test/run_translated_c.zig index 629a850836..ec6a11b9b4 100644 --- a/test/run_translated_c.zig +++ b/test/run_translated_c.zig @@ -195,4 +195,52 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void { \\ return 0; \\} , ""); + + cases.add("case boolean expression converted to int", + \\#include + \\int main(int argc, char **argv) { + \\ int value = 1 + 2 * 3 + 4 * 5 + 6 << 7 | 8 == 9; + \\ if (value != 4224) abort(); + \\ return 0; + \\} + , ""); + + cases.add("case boolean expression on left converted to int", + \\#include + \\int main(int argc, char **argv) { + \\ int value = 8 == 9 | 1 + 2 * 3 + 4 * 5 + 6 << 7; + \\ if (value != 4224) abort(); + \\ return 0; + \\} + , ""); + + cases.add("case boolean and operator+ converts bool to int", + \\#include + \\int main(int argc, char **argv) { + \\ int value = (8 == 9) + 3; + \\ int value2 = 3 + (8 == 9); + \\ if (value != value2) abort(); + \\ return 0; + \\} + , ""); + + cases.add("case boolean and operator<", + \\#include + \\int main(int argc, char **argv) { + \\ int value = (8 == 9) < 3; + \\ if (value == 0) abort(); + \\ return 0; + \\} + , ""); + + cases.add("case boolean and operator*", + \\#include + \\int main(int argc, char **argv) { + \\ int value = (8 == 9) * 3; + \\ int value2 = 3 * (9 == 9); + \\ if (value != 0) abort(); + \\ if (value2 == 0) abort(); + \\ return 0; + \\} + , ""); }