fixed: #490

Author: Maksim Volkau

src/FastExpressionCompiler/FastExpressionCompiler.cs

@@ -77,7 +77,6 @@ namespace FastExpressionCompiler
     using System.Diagnostics.CodeAnalysis;
     using static System.Environment;
     using static CodePrinter;
-    using System.Data.Odbc;
 
     /// <summary>The flags for the compiler</summary>
     [Flags]

…ed_calls_to_ConcurrentDictionary copy.cs …ng_lambdas_with_ref_struct_parameters.cstest/FastExpressionCompiler.IssueTests/Issue476_System_ExecutionEngineException_with_nullables_on_repeated_calls_to_ConcurrentDictionary copy.cs renamed to test/FastExpressionCompiler.IssueTests/Issue490_Regression_in_compiling_lambdas_with_ref_struct_parameters.cs test/FastExpressionCompiler.IssueTests/Issue476_System_ExecutionEngineException_with_nullables_on_repeated_calls_to_ConcurrentDictionary copy.cs renamed to test/FastExpressionCompiler.IssueTests/Issue490_Regression_in_compiling_lambdas_with_ref_struct_parameters.cs

@@ -1,4 +1,6 @@
+#if NET8_0_OR_GREATER
 using System;
+using System.Reflection.Emit;
 using System.Text.Json;
 
 #if LIGHT_EXPRESSION
@@ -42,12 +44,36 @@ public void Original_case(TestContext t)
 
         // the compiled function should return default(int), yet it calls reader.GetInt32 instead
         var a = fs(ref reader);
+        fs.AssertOpCodes(
+            OpCodes.Ldarg_1, //        at IL_0000
+            OpCodes.Call, // JsonTokenType Utf8JsonReader.get_TokenType() at IL_0001
+            OpCodes.Ldc_I4_S, // 11    at IL_0006
+            OpCodes.Bne_Un, // IL_0019 at IL_0008
+            OpCodes.Ldc_I4_0, //       at IL_0013
+            OpCodes.Br, // IL_0025     at IL_0014
+            OpCodes.Ldarg_1, //        at IL_0019
+            OpCodes.Call, // int Utf8JsonReader.GetInt32() at IL_0020
+            OpCodes.Ret  //            at IL_0025
+        );
         t.AreEqual(default, a);
 
         var ff = expr.CompileFast(false);
         ff.PrintIL(format: ILDecoder.ILFormat.AssertOpCodes);
+        ff.AssertOpCodes(
+            OpCodes.Ldarg_1, //        at IL_0000
+            OpCodes.Call, // JsonTokenType Utf8JsonReader.get_TokenType() at IL_0001
+            OpCodes.Ldc_I4_S, // 11    at IL_0006
+            OpCodes.Ceq, //            at IL_0008
+            OpCodes.Brfalse, // IL_0021at IL_0010
+            OpCodes.Ldc_I4_0, //       at IL_0015
+            OpCodes.Br, // IL_0027     at IL_0016
+            OpCodes.Ldarg_1, //        at IL_0021
+            OpCodes.Call, // int Utf8JsonReader.GetInt32() at IL_0022
+            OpCodes.Ret  //            at IL_0027
+        );
 
         var b = ff(ref reader);
         t.AreEqual(default, b);
     }
 }
+#endif

test/FastExpressionCompiler.TestsRunner/Program.cs

@@ -25,18 +25,21 @@ public static void Main()
             // new Issue441_Fails_to_pass_Constant_as_call_parameter_by_reference().Run();
             // new Issue461_InvalidProgramException_when_null_checking_type_by_ref().Run();
 
-            var t = new LightExpression.TestRun(LightExpression.TestFlags.RethrowException);
+            var lt = new LightExpression.TestRun(LightExpression.TestFlags.RethrowException);
 
-            t.Run(new LightExpression.IssueTests.Issue490_Regression_in_compiling_lambdas_with_ref_struct_parameters());
-            t.Run(new LightExpression.IssueTests.Issue398_Optimize_Switch_with_OpCodes_Switch());
-            t.Run(new LightExpression.IssueTests.Issue468_Optimize_the_delegate_access_to_the_Closure_object_for_the_modern_NET());
-            t.Run(new LightExpression.IssueTests.Issue472_TryInterpret_and_Reduce_primitive_arithmetic_and_logical_expressions_during_the_compilation());
-            t.Run(new LightExpression.IssueTests.Issue473_InvalidProgramException_when_using_Expression_Condition_with_converted_decimal_expression());
-            t.Run(new LightExpression.IssueTests.Issue476_System_ExecutionEngineException_with_nullables_on_repeated_calls_to_ConcurrentDictionary());
+#if NET8_0_OR_GREATER
+            lt.Run(new LightExpression.IssueTests.Issue490_Regression_in_compiling_lambdas_with_ref_struct_parameters());
+#endif
+
+            lt.Run(new LightExpression.IssueTests.Issue398_Optimize_Switch_with_OpCodes_Switch());
+            lt.Run(new LightExpression.IssueTests.Issue468_Optimize_the_delegate_access_to_the_Closure_object_for_the_modern_NET());
+            lt.Run(new LightExpression.IssueTests.Issue472_TryInterpret_and_Reduce_primitive_arithmetic_and_logical_expressions_during_the_compilation());
+            lt.Run(new LightExpression.IssueTests.Issue473_InvalidProgramException_when_using_Expression_Condition_with_converted_decimal_expression());
+            lt.Run(new LightExpression.IssueTests.Issue476_System_ExecutionEngineException_with_nullables_on_repeated_calls_to_ConcurrentDictionary());
 
 #if NET8_0_OR_GREATER
-            var ts = new TestRun();
-            ts.Run(new Issue475_Reuse_DynamicMethod_if_possible());
+            var st = new TestRun();
+            st.Run(new Issue475_Reuse_DynamicMethod_if_possible());
 #endif
 
             RunAllTests();