Skip to content

[mono][wasm] Pin corlib exceptions after creation. #68801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vargaz merged 1 commit into from
May 4, 2022
Merged

[mono][wasm] Pin corlib exceptions after creation. #68801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions src/mono/mono/mini/mini-exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3413,7 +3413,7 @@ mono_install_ftnptr_eh_callback (MonoFtnPtrEHCallback callback)
*/

static void
throw_exception (MonoObject *ex, gboolean rethrow)
llvmonly_setup_exception (MonoObject *ex, gboolean rethrow)
{
MONO_REQ_GC_UNSAFE_MODE;

Expand All @@ -3430,8 +3430,11 @@ throw_exception (MonoObject *ex, gboolean rethrow)
else
mono_ex = (MonoException*)ex;

// Note: Not pinned
jit_tls->thrown_exc = mono_gchandle_new_internal ((MonoObject*)mono_ex, FALSE);
if (jit_tls->thrown_exc)
/* Already set in mini_llvmonly_throw_corlib_exception () */
mono_gchandle_set_target (jit_tls->thrown_exc, (MonoObject*)mono_ex);
else
jit_tls->thrown_exc = mono_gchandle_new_internal ((MonoObject*)mono_ex, TRUE);

if (!rethrow) {
#ifdef MONO_ARCH_HAVE_UNWIND_BACKTRACE
Expand All @@ -3454,15 +3457,6 @@ throw_exception (MonoObject *ex, gboolean rethrow)
g_list_free (trace);
#endif
}

if (rethrow) {
MonoContext ctx;
MonoJitInfo *out_ji;
memset (&ctx, 0, sizeof (MonoContext));

mono_handle_exception_internal (&ctx, ex, FALSE, &out_ji);
mono_llvm_cpp_throw_exception ();
}
}

void
Expand All @@ -3482,7 +3476,7 @@ mini_llvmonly_throw_exception (MonoObject *ex)

mono_handle_exception (&ctx, (MonoObject*)ex);

throw_exception (ex, FALSE);
llvmonly_setup_exception (ex, FALSE);

/* Unwind back to either an AOTed frame or to the interpreter */
mono_llvm_cpp_throw_exception ();
Expand All @@ -3491,16 +3485,26 @@ mini_llvmonly_throw_exception (MonoObject *ex)
void
mini_llvmonly_rethrow_exception (MonoObject *ex)
{
throw_exception (ex, TRUE);
llvmonly_setup_exception (ex, TRUE);

MonoContext ctx;
MonoJitInfo *out_ji;
memset (&ctx, 0, sizeof (MonoContext));

mono_handle_exception_internal (&ctx, ex, FALSE, &out_ji);

mono_llvm_cpp_throw_exception ();
}

void
mini_llvmonly_throw_corlib_exception (guint32 ex_token_index)
{
guint32 ex_token = MONO_TOKEN_TYPE_DEF | ex_token_index;
MonoJitTlsData *jit_tls = mono_get_jit_tls ();
MonoException *ex;

ex = mono_exception_from_token (m_class_get_image (mono_defaults.exception_class), ex_token);
jit_tls->thrown_exc = mono_gchandle_new_internal ((MonoObject*)ex, FALSE);

mini_llvmonly_throw_exception ((MonoObject*)ex);
}
Expand Down