CSHARP-5628: Add new boolean expression simplifications to PartialEvaluator

src/MongoDB.Driver/Linq/Linq3Implementation/Misc/PartialEvaluator.cs

@@ -75,60 +75,137 @@ public override Expression Visit(Expression expression)
 
             protected override Expression VisitBinary(BinaryExpression node)
             {
-                if (node.NodeType == ExpressionType.AndAlso)
+                var leftExpression = node.Left;
+                var rightExpression = node.Right;
+
+                if (leftExpression.Type == typeof(bool) && rightExpression.Type == typeof(bool))
                 {
-                    var leftExpression = Visit(node.Left);
-                    if (leftExpression is ConstantExpression constantLeftExpression )
+                    if (node.NodeType == ExpressionType.AndAlso)
                     {
-                        var value = (bool)constantLeftExpression.Value;
-                        return value ? Visit(node.Right) : Expression.Constant(false);
+                        leftExpression = Visit(leftExpression);
+                        if (IsConstant<bool>(leftExpression, out var leftValue))
+                        {
+                            // true && Q => Q
+                            // false && Q => false
+                            return leftValue ? Visit(rightExpression) : Expression.Constant(false);
+                        }
+
+                        rightExpression = Visit(rightExpression);
+                        if (IsConstant<bool>(rightExpression, out var rightValue))
+                        {
+                            // P && true => P
+                            // P && false => false
+                            return rightValue ? leftExpression : Expression.Constant(false);
+                        }
+
+                        return node.Update(leftExpression, conversion: null, rightExpression);
                     }
 
-                    var rightExpression = Visit(node.Right);
-                    if (rightExpression is ConstantExpression constantRightExpression)
+                    if (node.NodeType == ExpressionType.OrElse)
                     {
-                        var value = (bool)constantRightExpression.Value;
-                        return value ? leftExpression : Expression.Constant(false);
+                        leftExpression = Visit(leftExpression);
+                        if (IsConstant<bool>(leftExpression, out var leftValue))
+                        {
+                            // true || Q => true
+                            // false || Q => Q
+                            return leftValue ? Expression.Constant(true) : Visit(rightExpression);
+                        }
+
+                        rightExpression = Visit(rightExpression);
+                        if (IsConstant<bool>(rightExpression, out var rightValue))
+                        {
+                            // P || true => true
+                            // P || false => P
+                            return rightValue ? Expression.Constant(true) : leftExpression;
+                        }
+
+                        return node.Update(leftExpression, conversion: null, rightExpression);
                     }
+                }
+
+                return base.VisitBinary(node);
+            }
 
-                    return node.Update(leftExpression, conversion: null, rightExpression);
+            protected override Expression VisitConditional(ConditionalExpression node)
+            {
+                var test = Visit(node.Test);
+
+                if (IsConstant<bool>(test, out var testValue))
+                {
+                    // true ? A : B => A
+                    // false ? A : B => B
+                    return testValue ? Visit(node.IfTrue) : Visit(node.IfFalse);
                 }
 
-                if (node.NodeType == ExpressionType.OrElse)
+                var ifTrue = Visit(node.IfTrue);
+                var ifFalse = Visit(node.IfFalse);
+
+                if (BothAreConstant<bool>(ifTrue, ifFalse, out var ifTrueValue, out var ifFalseValue))
                 {
-                    var leftExpression = Visit(node.Left);
-                    if (leftExpression is ConstantExpression constantLeftExpression)
+                    return (ifTrueValue, ifFalseValue) switch
                     {
-                        var value = (bool)constantLeftExpression.Value;
-                        return value ? Expression.Constant(true) : Visit(node.Right);
-                    }
+                        (false, false) => Expression.Constant(false), // T ? false : false => false
+                        (false, true) => Expression.Not(test), // T ? false : true => !T
+                        (true, false) => test, // T ? true : false => T
+                        (true, true) => Expression.Constant(true) // T ? true : true => true
+                    };
+                }
+                else if (IsConstant<bool>(ifTrue, out ifTrueValue))
+                {
+                    // T ? true : Q => T || Q
+                    // T ? false : Q => !T && Q
+                    return ifTrueValue
+                        ? Visit(Expression.OrElse(test, ifFalse))
+                        : Visit(Expression.AndAlso(Expression.Not(test), ifFalse));
+                }
+                else if (IsConstant<bool>(ifFalse, out ifFalseValue))
+                {
+                    // T ? P : true => !T || P
+                    // T ? P : false => T && P
+                    return ifFalseValue
+                        ? Visit(Expression.OrElse(Expression.Not(test), ifTrue))
+                        : Visit(Expression.AndAlso(test, ifTrue));
+                }
 
-                    var rightExpression = Visit(node.Right);
-                    if (rightExpression is ConstantExpression constantRightExpression)
+                return node.Update(test, ifTrue, ifFalse);
+            }
+
+            protected override Expression VisitUnary(UnaryExpression node)
+            {
+                var operand = Visit(node.Operand);
+
+                if (node.Type == typeof(bool) &&
+                    node.NodeType == ExpressionType.Not)
+                {
+                    if (operand is UnaryExpression innerUnaryExpressionOperand &&
+                        innerUnaryExpressionOperand.NodeType == ExpressionType.Not)
                     {
-                        var value = (bool)constantRightExpression.Value;
-                        return value ? Expression.Constant(true) : leftExpression;
+                        // !!P => P
+                        return innerUnaryExpressionOperand.Operand;
                     }
-
-                    return node.Update(leftExpression, conversion: null, rightExpression);
                 }
 
-                return base.VisitBinary(node);
+                return node.Update(operand);
             }
 
-            protected override Expression VisitConditional(ConditionalExpression node)
+            // private methods
+            private bool BothAreConstant<T>(Expression expression1, Expression expression2, out T constantValue1, out T constantValue2)
             {
-                var test = Visit(node.Test);
-                if (test is ConstantExpression constantTestExpression)
+                if (expression1 is ConstantExpression constantExpression1 &&
+                    expression2 is ConstantExpression constantExpression2 &&
+                    constantExpression1.Type == typeof(T) &&
+                    constantExpression2.Type == typeof(T))
                 {
-                    var value = (bool)constantTestExpression.Value;
-                    return value ? Visit(node.IfTrue) : Visit(node.IfFalse);
+                    constantValue1 = (T)constantExpression1.Value;
+                    constantValue2 = (T)constantExpression2.Value;
+                    return true;
                 }
 
-                return node.Update(test, Visit(node.IfTrue), Visit(node.IfFalse));
+                constantValue1 = default;
+                constantValue2 = default;
+                return false;
             }
 
-            // private methods
             private Expression Evaluate(Expression expression)
             {
                 if (expression.NodeType == ExpressionType.Constant)
@@ -139,6 +216,19 @@ private Expression Evaluate(Expression expression)
                 Delegate fn = lambda.Compile();
                 return Expression.Constant(fn.DynamicInvoke(null), expression.Type);
             }
+
+            private bool IsConstant<T>(Expression expression, out T constantValue)
+            {
+                if (expression is ConstantExpression constantExpression1 &&
+                    constantExpression1.Type == typeof(T))
+                {
+                    constantValue = (T)constantExpression1.Value;
+                    return true;
+                }
+
+                constantValue = default;
+                return false;
+            }
         }
 
         private class Nominator : ExpressionVisitor

tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp4337Tests.cs

@@ -32,10 +32,10 @@ public class CSharp4337Tests : LinqIntegrationTest<CSharp4337Tests.ClassFixture>
     {
         private static (Expression<Func<C, R<bool>>> Projection, string ExpectedStage, bool[] ExpectedResults)[] __predicate_should_use_correct_representation_test_cases = new (Expression<Func<C, R<bool>>> Projection, string ExpectedStage, bool[] ExpectedResults)[]
         {
-            (d => new R<bool> { N = d.Id, V = d.I1 == E.E1 ? true : false }, "{ $project : { N : '$_id', V : { $cond : { if : { $eq : ['$I1', 1] }, then : true, else : false } }, _id : 0 } }", new[] { true, false }),
-            (d => new R<bool> { N = d.Id, V = d.S1 == E.E1 ? true : false }, "{ $project : { N : '$_id', V : { $cond : { if : { $eq : ['$S1', 'E1'] }, then : true, else : false } }, _id : 0 } }", new[] { true, false }),
-            (d => new R<bool> { N = d.Id, V = E.E1 == d.I1 ? true : false }, "{ $project : { N : '$_id', V : { $cond : { if : { $eq : [1, '$I1'] }, then : true, else : false } }, _id : 0 } }", new[] { true, false }),
-            (d => new R<bool> { N = d.Id, V = E.E1 == d.S1 ? true : false }, "{ $project : { N : '$_id', V : { $cond : { if : { $eq : ['E1', '$S1'] }, then : true, else : false } }, _id : 0 } }", new[] { true, false })
+            (d => new R<bool> { N = d.Id, V = d.I1 == E.E1 ? true : false }, "{ $project : { N : '$_id', V : { $eq : ['$I1', 1] }, _id : 0 } }", new[] { true, false }),
+            (d => new R<bool> { N = d.Id, V = d.S1 == E.E1 ? true : false }, "{ $project : { N : '$_id', V : { $eq : ['$S1', 'E1'] }, _id : 0 } }", new[] { true, false }),
+            (d => new R<bool> { N = d.Id, V = E.E1 == d.I1 ? true : false }, "{ $project : { N : '$_id', V : { $eq : [1, '$I1'] }, _id : 0 } }", new[] { true, false }),
+            (d => new R<bool> { N = d.Id, V = E.E1 == d.S1 ? true : false }, "{ $project : { N : '$_id', V : { $eq : ['E1', '$S1'] }, _id : 0 } }", new[] { true, false })
         };
 
         public CSharp4337Tests(ClassFixture fixture)