Less Expression.Type calls

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Building/Builders/PartialIndexFilterBuilder.cs

@@ -47,29 +47,31 @@ public static void BuildFilter(IndexInfo index)
     protected override Expression VisitBinary(BinaryExpression b)
     {
       if (EnumRewritableOperations(b)) {
-        var bareLeft = b.Left.StripCasts();
-        var bareLeftType = bareLeft.Type.StripNullable();
-        var bareRight = b.Right.StripCasts();
-        var bareRightType = bareRight.Type.StripNullable();
-
-        if (bareLeftType.IsEnum && bareRight.NodeType == ExpressionType.Constant) {
-          var typeToCast = bareLeft.Type.IsNullable()
+        var leftNoCasts = b.Left.StripCasts();
+        var leftNoCastsType = leftNoCasts.Type;
+        var bareLeftType = leftNoCastsType.StripNullable();
+        var rightNoCasts = b.Right.StripCasts();
+        var rightNoCastsType = rightNoCasts.Type;
+        var bareRightType = rightNoCastsType.StripNullable();
+
+        if (bareLeftType.IsEnum && rightNoCasts.NodeType == ExpressionType.Constant) {
+          var typeToCast = leftNoCastsType.IsNullable()
             ? bareLeftType.GetEnumUnderlyingType().ToNullable()
-            : bareLeft.Type.GetEnumUnderlyingType();
+            : leftNoCastsType.GetEnumUnderlyingType();
 
           return base.VisitBinary(Expression.MakeBinary(
             b.NodeType,
-            Expression.Convert(bareLeft, typeToCast),
+            Expression.Convert(leftNoCasts, typeToCast),
             Expression.Convert(b.Right, typeToCast)));
         }
-        else if (bareRightType.IsEnum && bareLeft.NodeType == ExpressionType.Constant) {
-          var typeToCast = bareRight.Type.IsNullable()
+        else if (bareRightType.IsEnum && leftNoCasts.NodeType == ExpressionType.Constant) {
+          var typeToCast = rightNoCastsType.IsNullable()
             ? bareRightType.GetEnumUnderlyingType().ToNullable()
-            : bareRight.Type.GetEnumUnderlyingType();
+            : rightNoCastsType.GetEnumUnderlyingType();
 
           return base.VisitBinary(Expression.MakeBinary(
             b.NodeType,
-            Expression.Convert(bareRight, typeToCast),
+            Expression.Convert(rightNoCasts, typeToCast),
             Expression.Convert(b.Left, typeToCast)));
         }
       }

Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs

@@ -210,24 +210,25 @@ protected override Expression VisitBinary(BinaryExpression binaryExpression)
       else if (EnumRewritableOperations(binaryExpression)) {
         // Following two checks for enums are here to improve result query
         // performance because they let not to cast columns to integer.
-
-        var bareLeft = binaryExpression.Left.StripCasts();
-        var bareLeftType = bareLeft.Type.StripNullable();
-        var bareRight = binaryExpression.Right.StripCasts();
-        var bareRightType = bareRight.Type.StripNullable();
-
-        if (bareLeftType.IsEnum && bareRight.NodeType == ExpressionType.Constant) {
-          var typeToCast = bareLeft.Type.IsNullable()
+        var leftNoCasts = binaryExpression.Left.StripCasts();
+        var leftNoCastsType = leftNoCasts.Type;
+        var bareLeftType = leftNoCastsType.StripNullable();
+        var rightNoCasts = binaryExpression.Right.StripCasts();
+        var rightNoCastsType = rightNoCasts.Type;
+        var bareRightType = rightNoCastsType.StripNullable();
+
+        if (bareLeftType.IsEnum && rightNoCasts.NodeType == ExpressionType.Constant) {
+          var typeToCast = leftNoCastsType.IsNullable()
             ? bareLeftType.GetEnumUnderlyingType().ToNullable()
-            : bareLeft.Type.GetEnumUnderlyingType();
-          left = Visit(Expression.Convert(bareLeft, typeToCast));
+            : leftNoCastsType.GetEnumUnderlyingType();
+          left = Visit(Expression.Convert(leftNoCasts, typeToCast));
           right = Visit(Expression.Convert(binaryExpression.Right, typeToCast));
         }
-        else if (bareRightType.IsEnum && bareLeft.NodeType == ExpressionType.Constant) {
-          var typeToCast = (bareRight.Type.IsNullable())
+        else if (bareRightType.IsEnum && leftNoCasts.NodeType == ExpressionType.Constant) {
+          var typeToCast = rightNoCastsType.IsNullable()
             ? bareRightType.GetEnumUnderlyingType().ToNullable()
-            : bareRight.Type.GetEnumUnderlyingType();
-          left = Visit(Expression.Convert(bareRight, typeToCast));
+            : rightNoCastsType.GetEnumUnderlyingType();
+          left = Visit(Expression.Convert(rightNoCasts, typeToCast));
           right = Visit(Expression.Convert(binaryExpression.Left, typeToCast));
         }
         else {