Optimize boolean OrElse

hazzik · Aug 9, 2019 · bb03a23 · bb03a23
1 parent b1338fc
commit bb03a23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/DelegateDecompiler.Tests/BooleanTests.cs b/src/DelegateDecompiler.Tests/BooleanTests.cs
@@ -350,7 +350,7 @@ public void TestParameterOrElseParameter()
             Test(expected, expected2, compiled);
         }
 
-        [Test, Ignore("Needs optimization")]
+        [Test]
         public void TestFuncOrElseFunc()
         {
             Expression<Func<Func<bool>, Func<bool>, bool>> expected = (x, y) => x.Invoke() || y.Invoke();

diff --git a/src/DelegateDecompiler/OptimizeExpressionVisitor.cs b/src/DelegateDecompiler/OptimizeExpressionVisitor.cs
@@ -41,9 +41,9 @@ public override Expression Visit(Expression node)
         protected override Expression VisitConditional(ConditionalExpression node)
         {
             Debug.WriteLine(node);
+            var test = Visit(node.Test);
             var ifTrue = Visit(node.IfTrue);
             var ifFalse = Visit(node.IfFalse);
-            var test = Visit(node.Test);
 
             Expression expression;
             if (IsCoalesce(test, ifTrue, out expression))
@@ -94,6 +94,11 @@ protected override Expression VisitConditional(ConditionalExpression node)
                 }
             }
 
+            if (ifTrueConstant?.Value is true)
+            {
+                return Expression.OrElse(test, ifFalse);
+            }
+
             if (test.NodeType == ExpressionType.Not)
             {
                 if (ifTrueConstant?.Value as bool? == false)