Skip to content

[mono] UnsafeAccessor: Enable tests for extern static methods without type parameters #101265

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 4 commits into from
Apr 22, 2024
Merged

[mono] UnsafeAccessor: Enable tests for extern static methods without type parameters #101265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54e137e
Enable tests for methods without type parameters
fanyang-mono Apr 18, 2024
51e1bd6
Enable more field tests
fanyang-mono Apr 19, 2024
c055264
Enable all field tests
fanyang-mono Apr 19, 2024
ca84ec8
Fix the type to get size for
fanyang-mono Apr 19, 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
3 changes: 1 addition & 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 @@ -2322,7 +2322,6 @@ method_sig_from_accessor_sig (MonoMethodBuilder *mb, gboolean hasthis, MonoMetho
ret->hasthis = hasthis;
for (int i = 1; i < ret->param_count; i++)
ret->params [i - 1] = ret->params [i];
memset (&ret->params[ret->param_count - 1], 0, sizeof (MonoType)); // just in case
ret->param_count--;
return ret;
}
Expand Down Expand Up @@ -2467,7 +2466,7 @@ emit_unsafe_accessor_method_wrapper (MonoMethodBuilder *mb, MonoMethod *accessor
static void
emit_unsafe_accessor_wrapper_ilgen (MonoMethodBuilder *mb, MonoMethod *accessor_method, MonoMethodSignature *sig, MonoGenericContext *ctx, MonoUnsafeAccessorKind kind, const char *member_name)
{
if (accessor_method->is_inflated || accessor_method->is_generic || mono_class_is_ginst (accessor_method->klass) || ctx != NULL) {
if (accessor_method->is_generic || ctx != NULL) {
mono_mb_emit_exception_full (mb, "System", "BadImageFormatException", "UnsafeAccessor_Generics");
return;
}
Expand Down
32 changes: 18 additions & 14 deletions src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.Generics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,32 @@ private void Add(Struct a) =>
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89439", TestRuntimes.Mono)]
public static void Verify_Generic_AccessStaticFieldClass()
public static void Verify_Generic_AccessStaticFieldClass_NonGenericMethod()
{
Console.WriteLine($"Running {nameof(Verify_Generic_AccessStaticFieldClass)}");
Console.WriteLine($"Running {nameof(Verify_Generic_AccessStaticFieldClass_NonGenericMethod)}");

Assert.Equal(typeof(int).ToString(), GetPrivateStaticFieldInt((MyList<int>)null));

Assert.Equal(typeof(string).ToString(), GetPrivateStaticFieldString((MyList<string>)null));

Assert.Equal(typeof(Struct).ToString(), GetPrivateStaticFieldStruct((MyList<Struct>)null));

[UnsafeAccessor(UnsafeAccessorKind.StaticField, Name=MyList<int>.StaticFieldName)]
extern static ref string GetPrivateStaticFieldInt(MyList<int> d);

[UnsafeAccessor(UnsafeAccessorKind.StaticField, Name=MyList<string>.StaticFieldName)]
extern static ref string GetPrivateStaticFieldString(MyList<string> d);

[UnsafeAccessor(UnsafeAccessorKind.StaticField, Name=MyList<Struct>.StaticFieldName)]
extern static ref string GetPrivateStaticFieldStruct(MyList<Struct> d);
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89439", TestRuntimes.Mono)]
public static void Verify_Generic_AccessStaticFieldClass_GenericMethod()
{
Console.WriteLine($"Running {nameof(Verify_Generic_AccessStaticFieldClass_GenericMethod)}");

{
int expected = 10;
MyList<int>.SetStaticGenericField(expected);
Expand All @@ -85,15 +100,6 @@ public static void Verify_Generic_AccessStaticFieldClass()
Assert.Equal(expected, GetPrivateStaticField((MyList<string>)null));
}

[UnsafeAccessor(UnsafeAccessorKind.StaticField, Name=MyList<int>.StaticFieldName)]
extern static ref string GetPrivateStaticFieldInt(MyList<int> d);

[UnsafeAccessor(UnsafeAccessorKind.StaticField, Name=MyList<string>.StaticFieldName)]
extern static ref string GetPrivateStaticFieldString(MyList<string> d);

[UnsafeAccessor(UnsafeAccessorKind.StaticField, Name=MyList<Struct>.StaticFieldName)]
extern static ref string GetPrivateStaticFieldStruct(MyList<Struct> d);

[UnsafeAccessor(UnsafeAccessorKind.StaticField, Name=MyList<int>.StaticGenericFieldName)]
extern static ref V GetPrivateStaticField<V>(MyList<V> d);
}
Expand Down Expand Up @@ -284,7 +290,6 @@ public static void Verify_Generic_CallCtor()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89439", TestRuntimes.Mono)]
public static void Verify_Generic_GenericTypeNonGenericInstanceMethod()
{
Console.WriteLine($"Running {nameof(Verify_Generic_GenericTypeNonGenericInstanceMethod)}");
Expand Down Expand Up @@ -358,7 +363,6 @@ public static void Verify_Generic_GenericTypeGenericInstanceMethod()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/89439", TestRuntimes.Mono)]
public static void Verify_Generic_GenericTypeNonGenericStaticMethod()
{
Console.WriteLine($"Running {nameof(Verify_Generic_GenericTypeNonGenericStaticMethod)}");
Expand Down