From b7683c1a2c064c8980f0044b2434711e41cb1e35 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 23 Nov 2021 22:20:55 +0100 Subject: [PATCH] [mono] Remove support for Classic Xamarin for the Selector.GetHandle optimization, and add newer platforms. We haven't supported Classic mode for Xamarin for quite a few years now (monotouch, MonoMac), so that code is not needed anymore. However, we've added support for more platforms (tvOS, Mac Catalyst), so add support for those. --- src/mono/mono/mini/intrinsics.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mono/mono/mini/intrinsics.c b/src/mono/mono/mini/intrinsics.c index 92ac9ef74564a9..a25a215d08235a 100644 --- a/src/mono/mono/mini/intrinsics.c +++ b/src/mono/mono/mini/intrinsics.c @@ -1921,11 +1921,9 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign } } return NULL; - } else if (((!strcmp (cmethod_klass_image->assembly->aname.name, "MonoMac") || - !strcmp (cmethod_klass_image->assembly->aname.name, "monotouch")) && - !strcmp (cmethod_klass_name_space, "XamCore.ObjCRuntime") && - !strcmp (cmethod_klass_name, "Selector")) || - ((!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.iOS") || + } else if (((!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.iOS") || + !strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.TVOS") || + !strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.MacCatalyst") || !strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.Mac")) && !strcmp (cmethod_klass_name_space, "ObjCRuntime") && !strcmp (cmethod_klass_name, "Selector"))