* limit to IsAnyLocal|IsConst()

Author: BoyBaykiller

src/coreclr/jit/gentree.cpp

@@ -15381,6 +15381,16 @@ GenTree* Compiler::gtFoldAndOrXor(GenTree* tree)
 
         GenTree* op1 = tree->gtGetOp1();
         GenTree* op2 = tree->gtGetOp2();
+
+        auto supportedOp = [](GenTree* op) {
+            return op->OperIsAnyLocal() || op->OperIsConst();
+        };
+        if (!supportedOp(op1->gtGetOp1()) || !supportedOp(op1->gtGetOp2()) || !supportedOp(op2->gtGetOp1()) ||
+            !supportedOp(op2->gtGetOp2()))
+        {
+            return tree;
+        }
+
         if (!op1->OperIs(GT_EQ))
         {
             std::swap(op1, op2);
@@ -15399,8 +15409,8 @@ GenTree* Compiler::gtFoldAndOrXor(GenTree* tree)
             }
         }
 
-        if (fusedCmp != GT_NONE && GenTree::Compare(op1->gtGetOp1(), op2->gtGetOp1()) &&
-            GenTree::Compare(op1->gtGetOp2(), op2->gtGetOp2()))
+        if (fusedCmp != GT_NONE && GenTree::Compare(op1->gtGetOp2(), op2->gtGetOp2()) &&
+            GenTree::Compare(op1->gtGetOp1(), op2->gtGetOp1()))
         {
             return gtNewOperNode(fusedCmp, tree->TypeGet(), op1->gtGetOp1(), op1->gtGetOp2());
         }

src/coreclr/jit/ifconversion.cpp

@@ -983,7 +983,7 @@ GenTree* OptIfConversionDsc::TrySelectToCondOpLcl(GenTreeConditional* select)
 
 //-----------------------------------------------------------------------------
 // TrySelectToBitwiseOp: Try to optimize:
-// SELECT(x !=  3,  x > 3, 1) -> (x ==  3) | (x > 3)
+// SELECT(x !=  3,  x > 3, 1) -> (x ==  3) | (x >  3)
 // SELECT(x == 13, y == 4, 0) -> (x == 13) & (y == 4)
 //
 // Arguments:
@@ -1003,15 +1003,17 @@ GenTree* OptIfConversionDsc::TrySelectToBitwiseOp(GenTreeConditional* select)
         return nullptr;
     }
 
-    int64_t trueVal = falseInput->AsIntConCommon()->IntegralValue();
-    genTreeOps bitOp = (trueVal == 1) ? GT_OR : ((trueVal == 0) ? GT_AND : GT_NONE);
+    int64_t    trueVal = falseInput->AsIntConCommon()->IntegralValue();
+    genTreeOps bitOp   = (trueVal == 1) ? GT_OR : ((trueVal == 0) ? GT_AND : GT_NONE);
     if (bitOp == GT_NONE)
     {
         return nullptr;
     }
 
     if (bitOp == GT_OR)
     {
+        // Need to reverse for OR because of:
+        // SELECT(x != 3, x > 3, 1) -> (x == 3) | (x > 3)
         cond = m_compiler->gtReverseCond(cond);
     }