From 2cfc55117a81b65fd8c32f616bfd12f162724de8 Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Tue, 12 Sep 2017 11:52:50 -0700 Subject: [PATCH] [wasm] Don't use capture_context fast path that requires function tramps. --- mono/metadata/object.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mono/metadata/object.c b/mono/metadata/object.c index 2ea88c75f8c..7d373ae382b 100644 --- a/mono/metadata/object.c +++ b/mono/metadata/object.c @@ -7403,6 +7403,9 @@ mono_wait_handle_get_handle (MonoWaitHandle *handle) static MonoObject* mono_runtime_capture_context (MonoDomain *domain, MonoError *error) { +#ifdef HOST_WASM + return mono_runtime_invoke_checked (mono_get_context_capture_method (), NULL, NULL, error); +#else MONO_REQ_GC_UNSAFE_MODE; RuntimeInvokeFunction runtime_invoke; @@ -7424,6 +7427,7 @@ mono_runtime_capture_context (MonoDomain *domain, MonoError *error) runtime_invoke = (RuntimeInvokeFunction)domain->capture_context_runtime_invoke; return runtime_invoke (NULL, NULL, NULL, domain->capture_context_method); +#endif } /** * mono_async_result_new: -- 2.25.1