From 36233c7a72379cbb1ef772aba877cae0707712f8 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 24 Sep 2019 20:53:10 +0200 Subject: [PATCH] [checked-build] update allowed thread states (mono/mono#16971) Commit migrated from https://github.com/mono/mono/commit/153b5def01ae036ad1b9318cc54973a10919f0a7 --- src/mono/mono/utils/checked-build.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mono/mono/utils/checked-build.c b/src/mono/mono/utils/checked-build.c index 2d1ba66..8cd8735 100644 --- a/src/mono/mono/utils/checked-build.c +++ b/src/mono/mono/utils/checked-build.c @@ -369,6 +369,7 @@ assert_gc_safe_mode (const char *file, int lineno) switch (state = mono_thread_info_current_state (cur)) { case STATE_BLOCKING: case STATE_BLOCKING_SELF_SUSPENDED: + case STATE_BLOCKING_SUSPEND_REQUESTED: break; default: mono_fatal_with_history ("%s:%d: Expected GC Safe mode but was in %s state", file, lineno, mono_thread_state_name (state)); @@ -413,6 +414,7 @@ assert_gc_neutral_mode (const char *file, int lineno) case STATE_ASYNC_SUSPEND_REQUESTED: case STATE_BLOCKING: case STATE_BLOCKING_SELF_SUSPENDED: + case STATE_BLOCKING_SUSPEND_REQUESTED: break; default: mono_fatal_with_history ("%s:%d: Expected GC Neutral mode but was in %s state", file, lineno, mono_thread_state_name (state)); -- 2.7.4