From 05ffb16e5f7f91e7e939f0667205cfeea7a9ff9d Mon Sep 17 00:00:00 2001 From: Thays Date: Tue, 31 Aug 2021 18:16:31 -0300 Subject: [PATCH 1/2] Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1383962 --- src/mono/mono/mini/method-to-ir.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/mono/mono/mini/method-to-ir.c b/src/mono/mono/mini/method-to-ir.c index 96ac001f7eb464..103fb21403219c 100644 --- a/src/mono/mono/mini/method-to-ir.c +++ b/src/mono/mono/mini/method-to-ir.c @@ -6080,6 +6080,15 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b seq_points = FALSE; } + if (method->wrapper_type == MONO_WRAPPER_OTHER) { + WrapperInfo *info = mono_marshal_get_wrapper_info (method); + if (info->subtype == WRAPPER_SUBTYPE_INTERP_IN) + { + /* We could hit a seq point before attaching to the JIT (#8338) */ + seq_points = FALSE; + } + } + if (cfg->prof_coverage) { if (cfg->compile_aot) g_error ("Coverage profiling is not supported with AOT."); From 1c2d3507e30548647c54326e7ec47522bfd82fe6 Mon Sep 17 00:00:00 2001 From: Thays Date: Tue, 31 Aug 2021 18:24:19 -0300 Subject: [PATCH 2/2] Fix { --- src/mono/mono/mini/method-to-ir.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mono/mono/mini/method-to-ir.c b/src/mono/mono/mini/method-to-ir.c index 103fb21403219c..151b9dbe6a8c1d 100644 --- a/src/mono/mono/mini/method-to-ir.c +++ b/src/mono/mono/mini/method-to-ir.c @@ -6082,8 +6082,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b if (method->wrapper_type == MONO_WRAPPER_OTHER) { WrapperInfo *info = mono_marshal_get_wrapper_info (method); - if (info->subtype == WRAPPER_SUBTYPE_INTERP_IN) - { + if (info->subtype == WRAPPER_SUBTYPE_INTERP_IN) { /* We could hit a seq point before attaching to the JIT (#8338) */ seq_points = FALSE; }