From c548bbbcf3ea41a916d153ca99960bc8f4709873 Mon Sep 17 00:00:00 2001
From: Colin Leroy-Mira <colin@colino.net>
Date: Fri, 2 Feb 2024 13:54:58 +0100
Subject: [PATCH] Fix #2395

Thanks to @acqn
---
 src/cc65/coptstop.c |  6 +++---
 test/todo/bug2395.c |  7 -------
 test/val/bug2395.c  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 test/val/bug2395.c

diff --git a/src/cc65/coptstop.c b/src/cc65/coptstop.c
index 7e024ae88..402f16b97 100644
--- a/src/cc65/coptstop.c
+++ b/src/cc65/coptstop.c
@@ -1488,7 +1488,7 @@ static const OptFuncDesc FuncTable[] = {
 };
 
 static const OptFuncDesc FuncRegATable[] = {
-    { "tosandax",   Opt_a_tosand,  REG_NONE, OP_NONE                                   },
+    { "tosandax",   Opt_a_tosand,  REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
     { "toseqax",    Opt_a_toseq,   REG_NONE, OP_NONE                                   },
     { "tosgeax",    Opt_a_tosuge,  REG_NONE, OP_NONE                                   },
     { "tosgtax",    Opt_a_tosugt,  REG_NONE, OP_NONE                                   },
@@ -1496,13 +1496,13 @@ static const OptFuncDesc FuncRegATable[] = {
     { "tosleax",    Opt_a_tosule,  REG_NONE, OP_NONE                                   },
     { "tosltax",    Opt_a_tosult,  REG_NONE, OP_NONE                                   },
     { "tosneax",    Opt_a_tosne,   REG_NONE, OP_NONE                                   },
-    { "tosorax",    Opt_a_tosor,   REG_NONE, OP_NONE                                   },
+    { "tosorax",    Opt_a_tosor,   REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
     { "tossubax",   Opt_a_tossub,  REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
     { "tosugeax",   Opt_a_tosuge,  REG_NONE, OP_NONE                                   },
     { "tosugtax",   Opt_a_tosugt,  REG_NONE, OP_NONE                                   },
     { "tosuleax",   Opt_a_tosule,  REG_NONE, OP_NONE                                   },
     { "tosultax",   Opt_a_tosult,  REG_NONE, OP_NONE                                   },
-    { "tosxorax",   Opt_a_tosxor,  REG_NONE, OP_NONE                                   },
+    { "tosxorax",   Opt_a_tosxor,  REG_NONE, OP_RHS_REMOVE_DIRECT | OP_RHS_LOAD_DIRECT },
 };
 
 #define FUNC_COUNT(Table) (sizeof(Table) / sizeof(Table[0]))
diff --git a/test/todo/bug2395.c b/test/todo/bug2395.c
index 4f4d2a6d0..07c5cd7c5 100644
--- a/test/todo/bug2395.c
+++ b/test/todo/bug2395.c
@@ -40,12 +40,5 @@ int main(void) {
     }
     printf("%d errors\n", fails);
 
-#ifdef __OPT__
     return fails;
-#else
-    /* Force exit failure on non-optimised version, which works,
-     * otherwise it breaks the build
-     */
-    return 1;
-#endif
 }
diff --git a/test/val/bug2395.c b/test/val/bug2395.c
new file mode 100644
index 000000000..1a2aa61e1
--- /dev/null
+++ b/test/val/bug2395.c
@@ -0,0 +1,45 @@
+
+/* bug #2395: Bitwise operators with a boolean expression fail when optimized */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+unsigned char a, b;
+unsigned char c = 199;
+unsigned char d = 100;
+
+int main(void) {
+    int fails = 0;
+
+    a = c ^ (d != 0);
+    b = c ^ 1;
+
+    printf("%u ^ (%u != 0) => %u\n", c, d, a);
+    if (a != b) {
+      printf("XOR error: a %d instead of %d\n", a, b);
+      fails++;
+    }
+
+    b = c | d;
+    a = c | (d != 0);
+    b = c | 1;
+
+    printf("%u | (%u != 0) => %u\n", c, d, a);
+    if (a != b) {
+      printf("OR error: a %d instead of %d\n", a, b);
+      fails++;
+    }
+
+    a = c & (d != 0);
+    b = c & 1;
+
+    printf("%u & (%u != 0) => %u\n", c, d, a);
+    if (a != b) {
+      printf("AND error: a %d instead of %d\n", a, b);
+      fails++;
+    }
+    printf("%d errors\n", fails);
+
+    return fails;
+}