Skip to content

[mono][interp] Properly handle exceptions thrown by mono_marshal_get_native_wrapper #110232

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
merged 3 commits into from
Nov 29, 2024
Merged

[mono][interp] Properly handle exceptions thrown by mono_marshal_get_native_wrapper #110232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cc97a8
[mono][interp] Defer calls to mono_marshal_get_native_wrapper at exec…
BrzVlad Nov 25, 2024
60e9d62
[mono][interp] Check resume state when returning from method compilation
BrzVlad Nov 27, 2024
e21ae98
[mono][interp] Fix tiering disable condition
BrzVlad Nov 28, 2024
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
5 changes: 4 additions & 1 deletion src/mono/mono/mini/interp/interp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,9 @@ mono_interp_get_imethod (MonoMethod *method)
imethod->is_invoke = (m_class_get_parent (method->klass) == mono_defaults.multicastdelegate_class) && !strcmp(method->name, "Invoke");
// always optimize code if tiering is disabled
// always optimize wrappers
if (!mono_interp_tiering_enabled () || method->wrapper_type != MONO_WRAPPER_NONE)
if (!mono_interp_tiering_enabled () || method->wrapper_type != MONO_WRAPPER_NONE || (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
imethod->optimized = TRUE;

if (imethod->method->string_ctor)
imethod->rtype = m_class_get_byval_arg (mono_defaults.string_class);
else
Expand Down Expand Up @@ -3916,6 +3917,7 @@ mono_interp_exec_method (InterpFrame *frame, ThreadContext *context, FrameClause
if (method_entry_ex)
THROW_EX (method_entry_ex, NULL);
EXCEPTION_CHECKPOINT;
CHECK_RESUME_STATE (context);
}

if (!clause_args) {
Expand Down Expand Up @@ -4372,6 +4374,7 @@ mono_interp_exec_method (InterpFrame *frame, ThreadContext *context, FrameClause
if (call_ex)
THROW_EX (call_ex, NULL);
EXCEPTION_CHECKPOINT;
CHECK_RESUME_STATE (context);
}

context->stack_pointer = (guchar*)frame->stack + cmethod->alloca_size;
Expand Down
22 changes: 17 additions & 5 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2692,8 +2692,6 @@ static MonoMethod*
interp_transform_internal_calls (MonoMethod *method, MonoMethod *target_method, MonoMethodSignature *csignature, gboolean is_virtual)
{
if (((method->wrapper_type == MONO_WRAPPER_NONE) || (method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)) && target_method != NULL) {
if (target_method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)
target_method = mono_marshal_get_native_wrapper (target_method, FALSE, FALSE);
if (!is_virtual && target_method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)
target_method = mono_marshal_get_synchronized_wrapper (target_method);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can mono_marshal_get_synchronized_wrapper run managed callbacks that can end up throwing an exception as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. This scenario was happening when looking up for the pinvoke call in libraries, which is not relevant for the synchronized wrapper.


Expand Down Expand Up @@ -3733,9 +3731,19 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
}
}

if (op == -1)
if (op == -1) {
target_method = interp_transform_internal_calls (method, target_method, csignature, is_virtual);

if (((method->wrapper_type == MONO_WRAPPER_NONE) || (method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)) && target_method != NULL) {
if (target_method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
// Avoid calling mono_marshal_get_native_wrapper () too early, it might call managed callbacks.
csignature = mono_metadata_signature_dup_mempool (td->mempool, csignature);
csignature->pinvoke = FALSE;
native = FALSE;
}
}
}

if (csignature->call_convention == MONO_CALL_VARARG)
csignature = mono_method_get_signature_checked (target_method, image, token, generic_context, error);

Expand Down Expand Up @@ -9770,16 +9778,20 @@ mono_interp_transform_method (InterpMethod *imethod, ThreadContext *context, Mon
generic_context = &generic_container->context;
}

if (method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME)) {
if ((method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME)) ||
(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
MonoMethod *nm = NULL;
if (imethod->transformed) {
MONO_PROFILER_RAISE (jit_done, (method, imethod->jinfo));
return;
}

/* assumes all internal calls with an array this are built in... */
if (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL && (! mono_method_signature_internal (method)->hasthis || m_class_get_rank (method->klass) == 0)) {
if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL && (! mono_method_signature_internal (method)->hasthis || m_class_get_rank (method->klass) == 0)) ||
(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
nm = mono_marshal_get_native_wrapper (method, FALSE, FALSE);
if (context->has_resume_state)
return;
} else {
const char *name = method->name;
if (m_class_get_parent (method->klass) == mono_defaults.multicastdelegate_class) {
Expand Down