Fix invalid lowering for SELECT over mixed neg/not operands (#87674)

dotnet · Jun 16, 2023 · d334f0c · d334f0c
1 parent 783402c
commit d334f0c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/coreclr/jit/lowerarmarch.cpp b/src/coreclr/jit/lowerarmarch.cpp
@@ -2579,7 +2579,7 @@ void Lowering::TryLowerCselToCinvOrCneg(GenTreeOp* select, GenTree* cond)
 
     assert(trueVal->OperIs(GT_NOT, GT_NEG) || falseVal->OperIs(GT_NOT, GT_NEG));
 
-    if (trueVal->OperIs(GT_NOT) || trueVal->OperIs(GT_NEG))
+    if ((isCneg && trueVal->OperIs(GT_NEG)) || (!isCneg && trueVal->OperIs(GT_NOT)))
     {
         shouldReverseCondition  = true;
         invertedOrNegatedVal    = trueVal->gtGetOp1();

diff --git a/src/tests/JIT/opt/Compares/conditionalNegates.cs b/src/tests/JIT/opt/Compares/conditionalNegates.cs
@@ -129,4 +129,23 @@ public static void cneg_shifted_true_oper(int op1, int op2, int expected)
         int result = op1 < 51 ? -(op1 >> 3) : op2;
         Assert.Equal(expected, result);
     }
+
+    [Theory]
+    [InlineData(1, -1)]
+    [InlineData(55, ~55)]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static void cneg_mixed_not_and_neg_oper(int op1, int expected)
+    {
+        //ARM64-FULL-LINE: cmp {{w[0-9]+}}, #52
+        //ARM64-FULL-LINE-NEXT: csneg {{w[0-9]+}}, {{w[0-9]+}}, {{w[0-9]+}}, {{gt|le}}
+        if (op1 <= 52)
+        {
+            op1 = -op1;
+        }
+        else
+        {
+            op1 = ~op1;
+        }
+        Assert.Equal(expected, op1);
+    }
 }