Skip to content
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

Jump to bottom

[mono] UnsafeAccessor: Add support for generic method instance #101442

Merged
merged 5 commits into from
Apr 27, 2024
Merged

[mono] UnsafeAccessor: Add support for generic method instance #101442

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8168b80
Support non generic instance
fanyang-mono Apr 23, 2024
0531ed9
Merge branch 'main' into unsafe_accessor_generic_2
lewing Apr 26, 2024
a46b375
Create helper function for shared code
fanyang-mono Apr 26, 2024
a380cde
Use an existing API
fanyang-mono Apr 26, 2024
468d481
Add an assert
fanyang-mono Apr 26, 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
41 changes: 25 additions & 16 deletions src/mono/mono/metadata/marshal-lightweight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2393,6 +2393,27 @@ update_signature (MonoMethod *accessor_method)
g_assert_not_reached ();
}

static MonoClass *
get_container_class (MonoClass *klass)
{
return mono_class_is_ginst (klass) ? mono_class_get_generic_class (klass)->container_class : klass;
}
fanyang-mono marked this conversation as resolved.
Show resolved Hide resolved

static MonoMethod *
inflate_method (MonoClass *klass, MonoMethod *method, MonoMethod *accessor_method, MonoError *error)
{
MonoMethod *result = method;
MonoGenericContext context = { NULL, NULL };
if (mono_class_is_ginst (klass))
context.class_inst = mono_class_get_generic_class (klass)->context.class_inst;
if (accessor_method->is_inflated)
context.method_inst = mono_method_get_context (accessor_method)->method_inst;
if ((context.class_inst != NULL) || (context.method_inst != NULL))
result = mono_class_inflate_generic_method_checked (method, &context, error);

return result;
}

static void
emit_unsafe_accessor_ctor_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor_method, MonoMethodSignature *sig, MonoGenericContext *ctx, MonoUnsafeAccessorKind kind, const char *member_name)
{
Expand Down Expand Up @@ -2420,7 +2441,7 @@ emit_unsafe_accessor_ctor_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor_m

MonoMethodSignature *member_sig = ctor_sig_from_accessor_sig (mb, sig, ctx);

MonoClass *in_class = mono_class_is_ginst (target_class) ? mono_class_get_generic_class (target_class)->container_class : target_class;
MonoClass *in_class = get_container_class (target_class);

MonoMethod *target_method = mono_unsafe_accessor_find_ctor (in_class, member_sig, target_class, find_method_error);
if (!is_ok (find_method_error) || target_method == NULL) {
Expand All @@ -2432,13 +2453,7 @@ emit_unsafe_accessor_ctor_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor_m
return;
}

MonoGenericContext context = { NULL, NULL };
if (mono_class_is_ginst (target_class))
context.class_inst = mono_class_get_generic_class (target_class)->context.class_inst;
if (accessor_method->is_inflated)
context.method_inst = mono_method_get_context (accessor_method)->method_inst;
if ((context.class_inst != NULL) || (context.method_inst != NULL))
target_method = mono_class_inflate_generic_method_checked (target_method, &context, find_method_error);
target_method = inflate_method (target_class, target_method, accessor_method, find_method_error);
fanyang-mono marked this conversation as resolved.
Show resolved Hide resolved

g_assert (target_method->klass == target_class);

Expand Down Expand Up @@ -2478,7 +2493,7 @@ emit_unsafe_accessor_method_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor

MonoMethodSignature *member_sig = method_sig_from_accessor_sig (mb, hasthis, sig, ctx);

MonoClass *in_class = mono_class_is_ginst (target_class) ? mono_class_get_generic_class (target_class)->container_class : target_class;
MonoClass *in_class = get_container_class (target_class);

MonoMethod *target_method = NULL;
if (!ctor_as_method)
Expand All @@ -2494,13 +2509,7 @@ emit_unsafe_accessor_method_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor
return;
}

MonoGenericContext context = { NULL, NULL };
if (mono_class_is_ginst (target_class))
context.class_inst = mono_class_get_generic_class (target_class)->context.class_inst;
if (accessor_method->is_inflated)
context.method_inst = mono_method_get_context (accessor_method)->method_inst;
if ((context.class_inst != NULL) || (context.method_inst != NULL))
target_method = mono_class_inflate_generic_method_checked (target_method, &context, find_method_error);
target_method = inflate_method (target_class, target_method, accessor_method, find_method_error);

if (!hasthis && target_method->klass != target_class) {
emit_missing_method_error (mb, find_method_error, member_name);
Expand Down
Loading