Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[mono] Some UnsafeAccessorAttribute support for methods and constructors #88925

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 13 commits into from
Jul 17, 2023
Merged

[mono] Some UnsafeAccessorAttribute support for methods and constructors #88925

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
afb9051
first cut at UnsafeAccessorKind.Constructor
lambdageek Jul 14, 2023
9d1a19a
Implement UnsafeAccessorKind.Method and StaticMethod
lambdageek Jul 14, 2023
6d293ea
remove debug output
lambdageek Jul 14, 2023
a529d43
change some asserts to BadImageFormatException
lambdageek Jul 14, 2023
a9220ee
enable some tests
lambdageek Jul 14, 2023
50c4f48
move CallAmbiguousMethod to a separate test case
lambdageek Jul 14, 2023
f540d0a
Fixup error checking; forbid generics
lambdageek Jul 14, 2023
f923a2f
match CoreCLR: callvirt for instance methods call for static
lambdageek Jul 14, 2023
9134ab0
fixups to pass new tests from https://github.com/dotnet/runtime/pull/…
lambdageek Jul 14, 2023
b96bcdb
Make CallCtorAsMethod tests work
lambdageek Jul 14, 2023
40c9184
Update src/tests/baseservices/compilerservices/UnsafeAccessors/Unsafe…
lambdageek Jul 14, 2023
f1b3977
Update src/tests/baseservices/compilerservices/UnsafeAccessors/Unsafe…
lambdageek Jul 14, 2023
8df791f
Apply suggestions from code review
lambdageek Jul 16, 2023
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
Prev Previous commit
Next Next commit
fixups to pass new tests from #88268
  • Loading branch information
@lambdageek
lambdageek committed Jul 14, 2023
commit 9134ab0a035b3fdf15f4c2acd2d7ccd08d71b1c0
18 changes: 16 additions & 2 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 @@ -2354,6 +2354,10 @@ emit_unsafe_accessor_field_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor_
mono_mb_emit_exception_full (mb, "System", "MissingFieldException", g_strdup_printf("UnsafeAccessorKind does not match expected static modifier on field '%s' in '%s'", member_name, m_class_get_name (target_class)));
return;
}
if (is_field_static && m_field_get_parent (target_field) != target_class) {
// don't look up static fields using the inheritance hierarchy
mono_mb_emit_exception_full (mb, "System", "MissingFieldException", g_strdup_printf("Field '%s' not found in '%s'", member_name, m_class_get_name (target_class)));
}

if (kind == MONO_UNSAFE_ACCESSOR_FIELD)
mono_mb_emit_ldarg (mb, 0);
Expand Down Expand Up @@ -2427,7 +2431,8 @@ emit_unsafe_accessor_ctor_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor_m
{
// TODO: support coreCLR's weird "you can call the .ctor as a normal instance member" method
g_assert (kind == MONO_UNSAFE_ACCESSOR_CTOR);
if (!member_name)
// null or empty string member name is ok for a constructor
if (!member_name || member_name[0] == '\0')
member_name = ".ctor";
if (strcmp (member_name, ".ctor") != 0) {
mono_mb_emit_exception_full (mb, "System", "BadImageFormatException", "Invalid UnsafeAccessorAttribute for constructor.");
Expand Down Expand Up @@ -2479,6 +2484,11 @@ emit_unsafe_accessor_method_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor

MonoClass *target_class = mono_class_from_mono_type_internal (target_type);

if (hasthis && m_class_is_valuetype (target_class) && !m_type_is_byref (target_type)) {
// If the non-static method access is for a value type, the instance must be byref.
mono_mb_emit_exception_full (mb, "System", "BadImageFormatException", "Invalid usage of UnsafeAccessorAttribute.");
}

ERROR_DECL(find_method_error);
MonoClass *in_class = mono_class_is_ginst (target_class) ? mono_class_get_generic_class (target_class)->container_class : target_class;
MonoMethod *target_method = mono_unsafe_accessor_find_method (in_class, member_name, member_sig, target_class, find_method_error);
Expand All @@ -2489,7 +2499,11 @@ emit_unsafe_accessor_method_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor
return;
}
g_assert (target_method);
g_assert (target_method->klass == target_class);
if (!hasthis && target_method->klass != target_class) {
emit_missing_method_error (mb, find_method_error, member_name);
return;
}
g_assert (target_method->klass == target_class); // are instance methods allowed to be looked up using inheritance?

emit_unsafe_accessor_ldargs (mb, sig, !hasthis ? 1 : 0);

Expand Down