From e26c484890b401526890be9f03c61727ec0da062 Mon Sep 17 00:00:00 2001
From: Vlad Brezae <brezaevlad@gmail.com>
Date: Thu, 17 Mar 2022 18:48:14 +0200
Subject: [PATCH 1/4] [mono][interp] Enable all IL_Conformance tests

---
 src/tests/issues.targets | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index a6ac6d9f3a9ca5..685756854f6026 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -2356,9 +2356,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/div_r8/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54375</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Invoke/deep/deep1_il_r/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -2494,9 +2491,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/CodeGenBringUpTests/Localloc_ro/**">
             <Issue>https://github.com/dotnet/runtime/issues/54359</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/neg_r4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/CodeGenBringUpTests/Localloc_d/**">
             <Issue>https://github.com/dotnet/runtime/issues/54359</Issue>
         </ExcludeList>
@@ -2524,9 +2518,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878/**">
             <Issue>https://github.com/dotnet/runtime/issues/54392</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/add_r4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726/**">
             <Issue>https://github.com/dotnet/runtime/issues/54392</Issue>
         </ExcludeList>
@@ -2536,30 +2527,12 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/mul_r4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909/**">
             <Issue>https://github.com/dotnet/runtime/issues/54392</Issue>
         </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/rem_r4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/div_r4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/sub_r4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/volatilldind/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -2578,9 +2551,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/eh/basics/throwinfilter_il_r/**">
             <Issue>https://github.com/dotnet/runtime/issues/47624</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)JIT/IL_Conformance/Old/Base/ckfinite/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54376</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/JitBlue/Runtime_64125/Runtime_64125/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -3094,10 +3064,6 @@
 
      <!-- These are known failures on mono-arm64 in the interpreter runtime variant -->
     <ItemGroup Condition=" '$(RuntimeFlavor)' == 'mono' and ('$(TargetArchitecture)' == 'arm64') and '$(TargetsWindows)' != 'true' and '$(RuntimeVariant)' == 'monointerpreter' " >
-        <!-- The following issues only effect the Mono interpreter; there is currently no way to exclude based on that scenario -->
-        <ExcludeList Include = "$(XunitTestBinBase)JIT/IL_Conformance/Old/Base/ckfinite/**">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/tracing/eventpipe/pauseonstart/**">
             <Issue> needs triage </Issue>
         </ExcludeList>
@@ -3206,12 +3172,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/jit64/opt/cse/VolatileTest_op_mul/**">
             <Issue>https://github.com/dotnet/runtime/issues/41472</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i/**">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i/**">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/eh/interactions/switchinfinally_d/**">
             <Issue>needs triage</Issue>
         </ExcludeList>

From fed47762b55c8bf5c60394d0552c6ca987ff163b Mon Sep 17 00:00:00 2001
From: Vlad Brezae <brezaevlad@gmail.com>
Date: Thu, 17 Mar 2022 19:01:17 +0200
Subject: [PATCH 2/4] [mono][interp] Enable tests

---
 src/tests/issues.targets | 42 ----------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 685756854f6026..58a7cef1ed3fa6 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -2095,9 +2095,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/jit64/verif/sniff/fg/ver_fg_13/**">
             <Issue>https://github.com/dotnet/runtime/issues/54396</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/NaN/r4nanconv_il_d/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/Statics/Misc/LiteralStatic/**">
             <Issue>https://github.com/dotnet/runtime/issues/54560</Issue>
         </ExcludeList>
@@ -2128,12 +2125,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -2143,12 +2134,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/NaN/r4nanconv_il_r/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -2164,18 +2149,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Directed/coverage/importer/volatilstind/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -2185,15 +2158,9 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/refany/indcall_il_d/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_605447/DevDiv_605447/**">
             <Issue>https://github.com/dotnet/runtime/issues/54391</Issue>
         </ExcludeList>
@@ -2236,9 +2203,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Invoke/fptr/valftn_t_il_r/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_710234/DevDiv_710234/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54381</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
@@ -3196,12 +3160,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/VT/callconv/jumps4_il_d/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/NaN/r8nanconv_il_d/**">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/NaN/r8nanconv_il_r/**">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/gc_poll/InsertGCPoll/**">
             <Issue>needs triage</Issue>
         </ExcludeList>

From 4fad95261d65844077a90b1d81bfd9d730248001 Mon Sep 17 00:00:00 2001
From: Vlad Brezae <brezaevlad@gmail.com>
Date: Sat, 19 Mar 2022 20:53:57 +0200
Subject: [PATCH 3/4] [mono][interp] Enable test

---
 src/tests/issues.targets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 58a7cef1ed3fa6..4cf3567dc91463 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -2113,9 +2113,6 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883/**">
-            <Issue>https://github.com/dotnet/runtime/issues/54394</Issue>
-        </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953/**">
             <Issue>needs triage</Issue>
         </ExcludeList>

From cb0ed7b4e7fd387df677827520a89d902ad28788 Mon Sep 17 00:00:00 2001
From: Vlad Brezae <brezaevlad@gmail.com>
Date: Wed, 23 Mar 2022 00:40:26 +0200
Subject: [PATCH 4/4] [tests] Fix ckfinite test

According to spec, ckfinite can throw ArithmeticException. CoreCLR throws OverflowException while mono throws ArithmeticException. Change test to catch all ArithmeticExceptions.
---
 src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il           | 4 ++--
 src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il | 4 ++--
 src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il b/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il
index 96d81177b0818d..90f6433c69e23b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il
@@ -24,7 +24,7 @@ handler_end:
 done:
 	ldc.i4	0x00000001
 	ret
-.try try_start to try_end catch [mscorlib]System.OverflowException handler handler_start to handler_end
+.try try_start to try_end catch [mscorlib]System.ArithmeticException handler handler_start to handler_end
 }
 
 .method public static int32 _ckfinite(float64) {
@@ -44,7 +44,7 @@ handler_end:
 done:
 	ldc.i4	0x00000001
 	ret
-.try try_start to try_end catch [mscorlib]System.OverflowException handler handler_start to handler_end
+.try try_start to try_end catch [mscorlib]System.ArithmeticException handler handler_start to handler_end
 }
 
 .method public static int32 main(class [mscorlib]System.String[]) {
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il
index 3b1a9c85999a17..3528396dec6237 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il
@@ -47,7 +47,7 @@ try_end:
 	ldc.i4		0x0
 	br			FINISH
 ae:
-	isinst		[mscorlib]System.OverflowException
+	isinst		[mscorlib]System.ArithmeticException
 	stloc	0
 	leave			HEnd
 HEnd:
@@ -77,7 +77,7 @@ FAIL:
 	br			FINISH
 FINISH:
 	ret
-.try try_start to try_end catch [mscorlib]System.OverflowException handler ae to HEnd
+.try try_start to try_end catch [mscorlib]System.ArithmeticException handler ae to HEnd
 }
 
 .method public static	int32 main(class [mscorlib]System.String[]) {
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il
index bbdea0fad0a20a..71328e23387f84 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il
@@ -49,7 +49,7 @@ try_end:
 	ldc.i4		0x0
 	br			FINISH
 ae:
-	isinst		[mscorlib]System.OverflowException
+	isinst		[mscorlib]System.ArithmeticException
 	stloc	0
 	leave			HEnd
 HEnd:
@@ -81,7 +81,7 @@ FAIL:
 	br			FINISH
 FINISH:
 	ret
-.try try_start to try_end catch [mscorlib]System.OverflowException handler ae to HEnd
+.try try_start to try_end catch [mscorlib]System.ArithmeticException handler ae to HEnd
 }
 
 .method public static	int32 main(class [mscorlib]System.String[]) {