Skip to content

[JIT] Add unboxing trampoline when virtual method needs to operate on value type #35766

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

Closed
fanyang-mono wants to merge 13 commits into from
Closed

[JIT] Add unboxing trampoline when virtual method needs to operate on value type #35766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
28d0684
Remove passing tests from exclude list
fanyang-mono Apr 17, 2020
2baa1f9
Merge branch 'master' of github.com:fanyang-mono/runtime
fanyang-mono Apr 28, 2020
aec962b
dd unboxing trampoline when method needs to operate on value type
fanyang-mono May 3, 2020
82b080a
Merge branch 'master' into coreclr_test_failures
fanyang-mono May 3, 2020
5659c80
Fix the condition when unboxing trampoline needs to be added
fanyang-mono May 4, 2020
dfa7fa2
rge branch 'coreclr_test_failures' of github.com:fanyang-mono/runtime…
fanyang-mono May 4, 2020
cddbb76
Merge branch 'coreclr_test_failures' of github.com:fanyang-mono/runti…
fanyang-mono May 4, 2020
4b511fd
rge branch 'coreclr_test_failures' of github.com:fanyang-mono/runtime…
fanyang-mono May 4, 2020
a823faf
Merge branch 'coreclr_test_failures' of github.com:fanyang-mono/runti…
fanyang-mono May 5, 2020
dbf0020
Replace method with res
fanyang-mono May 5, 2020
28ec4a4
Merge branch 'coreclr_test_failures' of github.com:fanyang-mono/runti…
fanyang-mono May 6, 2020
684b8db
To workaround the full aot issue by compiling the method directly ins…
fanyang-mono May 12, 2020
68da385
No need to add unbox for interpreter
fanyang-mono May 12, 2020
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
6 changes: 0 additions & 6 deletions src/coreclr/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,12 +1421,6 @@
<ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
<Issue>https://github.com/dotnet/runtime/issues/34068</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/VT/callconv/_il_dbgjumps4/**">
<Issue>https://github.com/dotnet/runtime/issues/34379</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/VT/callconv/_il_reljumps4/**">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/VT/port/_il_dbghuge_gcref/**">
<Issue>needs triage</Issue>
</ExcludeList>
Expand Down
24 changes: 23 additions & 1 deletion src/mono/mono/mini/jit-icalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ ldvirtfn_internal (MonoObject *obj, MonoMethod *method, gboolean gshared)
{
ERROR_DECL (error);
MonoMethod *res;
gpointer addr;

if (obj == NULL) {
mono_error_set_null_reference (error);
Expand All @@ -93,8 +94,29 @@ ldvirtfn_internal (MonoObject *obj, MonoMethod *method, gboolean gshared)
}

/* An rgctx wrapper is added by the trampolines no need to do it here */
gboolean need_unbox = m_class_is_valuetype (res->klass) && !m_class_is_valuetype (method->klass);
if (need_unbox && !mono_use_interpreter) {
/*
* We can't return a jump trampoline here, because the trampoline code
* can't determine whenever to add an unbox trampoline (ldvirtftn) or
* not (ldftn). So compile the method here.
*/
addr = mono_compile_method_checked (res, error);
if (!is_ok (error)) {
mono_error_set_pending_exception (error);
return NULL;
}

if (mono_llvm_only && mono_method_needs_static_rgctx_invoke (res, FALSE))
// FIXME:
g_assert_not_reached ();

addr = mini_add_method_trampoline (res, addr, mono_method_needs_static_rgctx_invoke (res, FALSE), TRUE);
} else {
addr = mono_ldftn (res);
}

return mono_ldftn (res);
return addr;
}

void*
Expand Down