Skip to content

Fix Equals overload logic for some methods of an array created using MLC #60894

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
buyaa-n merged 2 commits into from
Oct 28, 2021
Merged

Fix Equals overload logic for some methods of an array created using MLC #60894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b1ef6
Fix Equals overload logic for some methods of an array created using MLC
buyaa-n Oct 26, 2021
32da4b8
Apply feedback
buyaa-n Oct 27, 2021
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: 3 additions & 0 deletions ...ection.MetadataLoadContext/src/System/Reflection/TypeLoading/Methods/RoSyntheticMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ public sealed override bool Equals([NotNullWhen(true)] object? obj)
if (DeclaringType != other.DeclaringType)
Copy link
Contributor

@steveharter steveharter Oct 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the current code, is DeclaringType always the same for every RoSyntheticMethod? It should be RoArrayType. In any case, comparing Declaring type as-is makes sense if RoSyntheticMethod is ever used outside of arrays.

Copy link
Contributor Author

@buyaa-n buyaa-n Oct 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes DeclaringType is always same for every RoSyntheticMethod, need to check it as-is for different array types like int[] vs long[]

return false;

if (ReturnType != other.ReturnType)
return false;

if (_uniquifier != other._uniquifier)
return false;

Expand Down
43 changes: 43 additions & 0 deletions src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,49 @@ public static void TestArraySetMethod()
return;
}

[Fact]
static void TestArrayMethodsGetSetAddressAreNotEquals()
{
void test(Type type)
{
MethodInfo v1 = type.GetMethod("Get");
MethodInfo v2 = type.GetMethod("Set");
MethodInfo v3 = type.GetMethod("Address");
Assert.NotEqual(v1, v2);
Assert.NotEqual(v1, v3);
Assert.NotEqual(v2, v3);
}

test(typeof(int[]));
test(typeof(int[]).Project());
}

[Fact]
static void TestArrayMethodsGetSetAddressEqualityForDifferentTypes()
{
void testNotEqual(Type type1, Type type2)
{
Assert.NotEqual(type1.GetMethod("Get"), type2.GetMethod("Get"));
Assert.NotEqual(type1.GetMethod("Set"), type2.GetMethod("Set"));
Assert.NotEqual(type1.GetMethod("Address"), type2.GetMethod("Address"));
}

testNotEqual(typeof(int[]), typeof(long[]));
testNotEqual(typeof(int[]).Project(), typeof(long[]).Project());
testNotEqual(typeof(int[]).Project(), typeof(int[]));

void testEqual(Type type1, Type type2)
{
Assert.Equal(type1.GetMethod("Get"), type2.GetMethod("Get"));
Assert.Equal(type1.GetMethod("Set"), type2.GetMethod("Set"));
Assert.Equal(type1.GetMethod("Address"), type2.GetMethod("Address"));
}

testEqual(typeof(int[]), typeof(int[]));
testEqual(typeof(int[]).Project(), typeof(int[]).Project());
testEqual(typeof(long[]).Project(), typeof(long[]).Project());
}

[Fact]
public static void TestArrayAddressMethod()
{
Expand Down