opt

Author: StefH

src/System.Linq.Dynamic.Core/Parser/ExpressionHelper.cs

@@ -361,7 +361,12 @@ public bool ExpressionQualifiesForNullPropagation(Expression? expression)
     public Expression GenerateDefaultExpression(Type type)
     {
 #if NET35
-        return Expression.Constant(Activator.CreateInstance(type));
+        if (type.IsValueType)
+        {
+            return Expression.Constant(Activator.CreateInstance(type), type);
+        }
+
+        return Expression.Constant(null, type);
 #else
         return Expression.Default(type);
 #endif
@@ -390,38 +395,22 @@ public bool TryConvertTypes(ref Expression left, ref Expression right)
         {
             left = Expression.Condition(
                 Expression.Equal(left, Expression.Constant(null, typeof(object))),
-                GenerateDefault(right.Type),
+                GenerateDefaultExpression(right.Type),
                 Expression.Convert(left, right.Type)
             );
         }
         else if (right.Type == typeof(object))
         {
             right = Expression.Condition(
                 Expression.Equal(right, Expression.Constant(null, typeof(object))),
-                GenerateDefault(left.Type),
+                GenerateDefaultExpression(left.Type),
                 Expression.Convert(right, left.Type)
             );
         }
 
         return true;
     }
 
-    public Expression GenerateDefault(Type type)
-    {
-#if NET35
-        // .NET 3.5 doesn't have Expression.Default
-        if (type.IsValueType)
-        {
-            return Expression.Constant(Activator.CreateInstance(type), type);
-        }
-
-        return Expression.Constant(null, type);
-#else
-        return Expression.Default(type);
-#endif
-    }
-
-
     private Expression? GetMemberExpression(Expression? expression)
     {
         if (ExpressionQualifiesForNullPropagation(expression))

src/System.Linq.Dynamic.Core/Parser/IExpressionHelper.cs

@@ -53,6 +53,4 @@ internal interface IExpressionHelper
     /// If the types are different (and not null), try to convert the object type to other type.
     /// </summary>
     bool TryConvertTypes(ref Expression left, ref Expression right);
-
-    Expression GenerateDefault(Type type);
 }