From 5c6a91dc26f812290acd78f42c30f6bcf4d5af4a Mon Sep 17 00:00:00 2001 From: Egor Bogatov Date: Fri, 20 Mar 2020 01:29:59 +0300 Subject: [PATCH] Don't crash with SO for AdvSimd.IsSupported (#33761) --- src/mono/mono/mini/intrinsics.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/mono/mini/intrinsics.c b/src/mono/mono/mini/intrinsics.c index aa59329..38b7150 100644 --- a/src/mono/mono/mini/intrinsics.c +++ b/src/mono/mono/mini/intrinsics.c @@ -1927,10 +1927,10 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign } #ifdef ENABLE_NETCORE - // Return false for IsSupported for all types in System.Runtime.Intrinsics.X86 - // as we don't support them now + // Return false for IsSupported for all types in System.Runtime.Intrinsics.* + // if it's not handled in mono_emit_simd_intrinsics if (in_corlib && - !strcmp ("System.Runtime.Intrinsics.X86", cmethod_klass_name_space) && + !strncmp ("System.Runtime.Intrinsics", cmethod_klass_name_space, 25) && !strcmp (cmethod->name, "get_IsSupported")) { EMIT_NEW_ICONST (cfg, ins, 0); ins->type = STACK_I4; -- 2.7.4