remove using bitwise or for logical or

Author: akuhlens

flang/lib/Parser/preprocessor.cpp

@@ -1278,19 +1278,18 @@ static std::int64_t ExpressionValue(const TokenSequence &token,
     case BITAND:
       left = left & right;
       break;
-    // (bool)(1 && 2) != (bool)(1 & 2), we can't use bitwise AND here.
-    case AND:
-      left = left && right;
-      break;
     case BITXOR:
       left = left ^ right;
       break;
-    // (bool)(1 || 2) == (bool)(1 | 2), seems like we can use `|` here.
-    // But should we?
-    case OR:
     case BITOR:
       left = left | right;
       break;
+    case AND:
+      left = left && right;
+      break;
+    case OR:
+      left = left || right;
+      break;
     case LT:
       left = -(left < right);
       break;

flang/test/Parser/issue-146362.2.f90

@@ -7,5 +7,12 @@ PROGRAM P
   !CHECK-NOT: FALSE
   WRITE(*,*) 'FALSE'
 #endif
+#if ((1 || 2) != 3)
+  !CHECK: TRUE
+  WRITE(*,*) 'TRUE'
+#else
+  !CHECK-NOT: FALSE
+  WRITE(*,*) 'FALSE'
+#endif
 END PROGRAM