Merge pull request #2116 from Unity-Technologies/6000.2-backport-uum-85288

Revert "Enable intrinsification of System.Numerics types in corlib"

Author: UnityAlex

.yamato/Run IL2CPP Tests.yml

@@ -37,7 +37,7 @@ commands:
 
     # Step 2 - clone unity/il2cpp into $env:PRTOOLS_BUILD_DIR\il2cpp (C:\buildslave\unity\il2cpp)
     - command: |
-
+        git config --global core.longpaths true
         cd $env:PRTOOLS_BUILD_DIR
 
         git clone --recurse-submodules https://github.cds.internal.unity3d.com/unity/il2cpp.git il2cpp
@@ -48,7 +48,6 @@ commands:
     - command: |
 
         cd $env:UNITY_SOURCE_PRTOOLS_DIR
-        git config --global core.longpaths true
         cmd /v /c dotnet run --project $env:YAMATO_WORK_DIR\prtools\PRTools\PRTools.csproj --test-mono-il2cpp-deps=$env:YAMATO_SOURCE_DIR/stevedore/artifactid.txt --backport=$env:BACKPORT_BRANCH --custom-il2cpp-repo-path=$env:PRTOOLS_BUILD_DIR/il2cpp --github-api-token=$env:IL2CPP_GITHUB_TOKEN --yamato-api-token=$env:YAMATO_TOKEN --yamato-long-lived-token --il2cpp-deps-manifest-file=il2cpp-deps.stevedore --yamato-owner-email=$env:YAMATO_OWNER_EMAIL --no-slack --no-push
         if ($LASTEXITCODE -ne 0) { echo "PRTools failed"; exit $LASTEXITCODE }
 

mono/mini/simd-intrinsics.c

@@ -2058,14 +2058,12 @@ mono_emit_simd_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
 	const char *class_name;
 	MonoInst *simd_inst = NULL;
 
-	if (mono_is_corlib_image (m_class_get_image (cmethod->klass)) ||
-	    is_sys_numerics_assembly (m_class_get_image (cmethod->klass)->assembly)) {
+	if (is_sys_numerics_assembly (m_class_get_image (cmethod->klass)->assembly)) {
 		simd_inst = emit_sys_numerics_intrinsics (cfg, cmethod, fsig, args);
 		goto on_exit;
 	}
 
-	if (mono_is_corlib_image (m_class_get_image (cmethod->klass)) ||
-	    is_sys_numerics_vectors_assembly (m_class_get_image (cmethod->klass)->assembly)) {
+	if (is_sys_numerics_vectors_assembly (m_class_get_image (cmethod->klass)->assembly)) {
 		simd_inst = emit_sys_numerics_vectors_intrinsics (cfg, cmethod, fsig, args);
 		goto on_exit;
 	}