From 4892710058999bde4eb1bb1a71cd1a23d0443185 Mon Sep 17 00:00:00 2001 From: Thays Date: Tue, 27 Jul 2021 09:58:20 -0300 Subject: [PATCH 1/2] Fix assert gc_unsafe. --- src/mono/mono/metadata/object.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mono/mono/metadata/object.c b/src/mono/mono/metadata/object.c index 4e601cca8c5e72..be58aea97672b7 100644 --- a/src/mono/mono/metadata/object.c +++ b/src/mono/mono/metadata/object.c @@ -4148,7 +4148,9 @@ mono_unhandled_exception_internal (MonoObject *exc_raw) void mono_unhandled_exception (MonoObject *exc) { + MONO_ENTER_GC_UNSAFE; MONO_EXTERNAL_ONLY_VOID (mono_unhandled_exception_internal (exc)); + MONO_EXIT_GC_UNSAFE; } static MonoObjectHandle From a916bcb8b0b95f0458bcb0905253b1cf3f7f872d Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Tue, 27 Jul 2021 10:39:56 -0300 Subject: [PATCH 2/2] Update src/mono/mono/metadata/object.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Aleksey Kliger (λgeek) --- src/mono/mono/metadata/object.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mono/mono/metadata/object.c b/src/mono/mono/metadata/object.c index be58aea97672b7..b4a19469544991 100644 --- a/src/mono/mono/metadata/object.c +++ b/src/mono/mono/metadata/object.c @@ -4148,9 +4148,7 @@ mono_unhandled_exception_internal (MonoObject *exc_raw) void mono_unhandled_exception (MonoObject *exc) { - MONO_ENTER_GC_UNSAFE; - MONO_EXTERNAL_ONLY_VOID (mono_unhandled_exception_internal (exc)); - MONO_EXIT_GC_UNSAFE; + MONO_EXTERNAL_ONLY_GC_UNSAFE_VOID (mono_unhandled_exception_internal (exc)); } static MonoObjectHandle