Skip to content

[release/7.0] [mono][interp] Add unbox when calling valuetype method through delegate #79614

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
carlossanlop merged 3 commits into from
Jan 4, 2023
Merged

[release/7.0] [mono][interp] Add unbox when calling valuetype method through delegate #79614

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dcd3b1
[mono][interp] Add unbox when calling valuetype method through delegate
BrzVlad Dec 9, 2022
ce06ae1
[tests] Add regression test
BrzVlad Dec 9, 2022
61d4333
[tests] Disable test on fullaot
BrzVlad Dec 9, 2022
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
Next Next commit
[mono][interp] Add unbox when calling valuetype method through delegate 
If we are calling an open instance delegate, where the target method is on a valuetype, we will need to unbox this pointer.
  • Loading branch information
@BrzVlad
BrzVlad committed Dec 13, 2022
commit 4dcd3b175bf86cbd42c037fe3887c9c6e01dfa04
7 changes: 6 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 @@ -3805,7 +3805,12 @@ interp_exec_method (InterpFrame *frame, ThreadContext *context, FrameClauseArgs
} else if ((m_method_is_virtual (del_imethod->method) && !m_method_is_static (del_imethod->method)) && !del->target && !m_class_is_valuetype (del_imethod->method->klass)) {
// 'this' is passed dynamically, we need to recompute the target method
// with each call
del_imethod = get_virtual_method (del_imethod, LOCAL_VAR (call_args_offset + MINT_STACK_SLOT_SIZE, MonoObject*)->vtable);
MonoObject *obj = LOCAL_VAR (call_args_offset + MINT_STACK_SLOT_SIZE, MonoObject*);
del_imethod = get_virtual_method (del_imethod, obj->vtable);
if (m_class_is_valuetype (obj->vtable->klass) && m_class_is_valuetype (del_imethod->method->klass)) {
// We are calling into a value type method, `this` needs to be unboxed
LOCAL_VAR (call_args_offset + MINT_STACK_SLOT_SIZE, gpointer) = mono_object_unbox_internal (obj);
}
} else {
del->interp_invoke_impl = del_imethod;
}
Expand Down