projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f59b99f
)
[wasm] Don't use capture_context fast path that requires function tramps.
author
Rodrigo Kumpera
<kumpera@gmail.com>
Tue, 12 Sep 2017 18:52:50 +0000
(11:52 -0700)
committer
Rodrigo Kumpera
<kumpera@gmail.com>
Tue, 12 Sep 2017 18:52:50 +0000
(11:52 -0700)
mono/metadata/object.c
patch
|
blob
|
history
diff --git
a/mono/metadata/object.c
b/mono/metadata/object.c
index 2ea88c75f8cfde20ecb362453f027e16dbe1225a..7d373ae382b85fbfc9190bbd80388ecbc7dc6119 100644
(file)
--- 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)
{
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;
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);
runtime_invoke = (RuntimeInvokeFunction)domain->capture_context_runtime_invoke;
return runtime_invoke (NULL, NULL, NULL, domain->capture_context_method);
+#endif
}
/**
* mono_async_result_new:
}
/**
* mono_async_result_new: