chore: Apply patch from dotnet/runtime#111318 (#148)

* chore: Apply patch from dotnet/runtime#111318

* ci: Update artifacts steps

* chore: Adjust patch

* chore: Adjust ubuntu

* chore: Adjust runners

* chore: adjust net install

* chore: Adjust net installer

* chore: remove container

Author: jeromelaban

.github/workflows/runtime-ci.yml

@@ -136,7 +136,7 @@ jobs:
         cd runtime\artifacts\bin\microsoft.netcore.app.runtime.browser-wasm\$env:BUILD_CONFIGURATION
         Compress-Archive -DestinationPath $ARTIFACTS_FOLDER\dotnet-runtime-wasm-windows-$env:CURRENT_COMMIT-$env:BASE_DOTNET_SHORT_COMMIT-${{ github.run_id }}-$env:BUILD_CONFIGURATION$archiveConfiguration.zip -Path *
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:
         name: wasm
@@ -147,8 +147,7 @@ jobs:
   ##
   build_linux_job:
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
-    runs-on: ubuntu-latest
-    container: 'unoplatform/wasm-build:2.3'
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
@@ -158,7 +157,7 @@ jobs:
 
     steps:
     - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.7.2
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version:  ${{ env.DOTNETSDK_VERSION }}
 
@@ -284,7 +283,7 @@ jobs:
         cd runtime/artifacts/bin/microsoft.netcore.app.runtime.browser-wasm/$BUILD_CONFIGURATION
         /usr/bin/zip -r $ARTIFACTS_FOLDER/dotnet-runtime-wasm-linux-$CURRENT_COMMIT-$BASE_DOTNET_SHORT_COMMIT-$GITHUB_RUN_ID-$BUILD_CONFIGURATION$ARCHIVE_CONFIGURATION.zip *
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:
         name: wasm
@@ -296,13 +295,13 @@ jobs:
   release_job:
     if: github.event_name == 'push'
     needs: [build_linux_job,build_windows_job]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     environment:
         name: Release
 
     steps:
     - name: Download package
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
           name: wasm
 

patches/0016-pr111318.patch

@@ -0,0 +1,15 @@
+diff --git a/src/mono/mono/mini/mini.c b/src/mono/mono/mini/mini.c
+index 63d89b3f28a56..592b5488cd1f2 100644
+--- a/src/mono/mono/mini/mini.c
++++ b/src/mono/mono/mini/mini.c
+@@ -3331,8 +3331,8 @@ mini_method_compile (MonoMethod *method, guint32 opts, JitFlags flags, int parts
+ 				MonoExceptionClause *clause1 = &cfg->header->clauses [i];
+ 				MonoExceptionClause *clause2 = &cfg->header->clauses [j];
+ 
+-				if (i != j && clause1->try_offset >= clause2->try_offset && clause1->handler_offset <= clause2->handler_offset) {
+-					if (clause1->flags == MONO_EXCEPTION_CLAUSE_NONE && clause2->flags != MONO_EXCEPTION_CLAUSE_NONE) {
++				if (clause1->flags == MONO_EXCEPTION_CLAUSE_NONE && clause2->flags == MONO_EXCEPTION_CLAUSE_FINALLY) {
++					if (clause1->try_offset >= clause2->handler_offset && clause1->try_offset <= (clause2->handler_offset + clause2->handler_len)) {
+ 						can_deopt = FALSE;
+ 						break;
+ 					}