Skip to content

Commit

Permalink
[mini] Don't assert on MONO_PATCH_INFO_GC_SAFE_POINT_FLAG if coop is …
Browse files Browse the repository at this point in the history
…disabled (mono/mono#9974)

If an AOT library is loaded that was compiled with safepoints, but currently
we're running with preemptive suspend (e.g. MONO_THREADS_SUSPEND=preemptive is
set), don't assert.  `mono_polling_required` will always be false, so the
safepoint will be ignored.

Fixes mono/mono#9947

Commit migrated from mono/mono@d36902e
  • Loading branch information
lambdageek authored and akoeplinger committed Aug 13, 2018
1 parent 933c3cf commit cbdbd81
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/mono/mono/mini/mini-runtime.c
Expand Up @@ -1405,7 +1405,6 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
break;
}
case MONO_PATCH_INFO_GC_SAFE_POINT_FLAG:
g_assert (mono_threads_are_safepoints_enabled ());
target = (gpointer)&mono_polling_required;
break;
case MONO_PATCH_INFO_SWITCH: {
Expand Down

0 comments on commit cbdbd81

Please sign in to comment.