Skip to content

Revert "Add the capability to walk up the inheritance chain for GetMemberWithSameMetadataDefinitionAs" #69137

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
jkotas merged 1 commit into from
May 10, 2022
Merged

Revert "Add the capability to walk up the inheritance chain for GetMemberWithSameMetadataDefinitionAs" #69137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 6 additions & 16 deletions ...vate.Reflection.Core/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.GetMember.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,22 +123,7 @@ public sealed override MemberInfo GetMemberWithSameMetadataDefinitionAs(MemberIn
if (member is null)
throw new ArgumentNullException(nameof(member));

// Need to walk up the inheritance chain if member is not found
// Leverage the existing cache mechanism of per type to store members
RuntimeTypeInfo? runtimeType = this;
while (runtimeType != null)
{
MemberInfo result = runtimeType.GetDeclaredMemberWithSameMetadataDefinitionAs(member);
if (result != null)
return result;
runtimeType = runtimeType.BaseType as RuntimeTypeInfo;
}
throw new ArgumentException(SR.Format(SR.Arg_MemberInfoNotFound, member.Name), nameof(member));
}

private MemberInfo GetDeclaredMemberWithSameMetadataDefinitionAs(MemberInfo member)
{
return member.MemberType switch
MemberInfo result = member.MemberType switch
{
MemberTypes.Method => QueryMemberWithSameMetadataDefinitionAs<MethodInfo>(member),
MemberTypes.Constructor => QueryMemberWithSameMetadataDefinitionAs<ConstructorInfo>(member),
Expand All @@ -148,6 +133,11 @@ private MemberInfo GetDeclaredMemberWithSameMetadataDefinitionAs(MemberInfo memb
MemberTypes.NestedType => QueryMemberWithSameMetadataDefinitionAs<Type>(member),
_ => null,
};

if (result is null)
throw new ArgumentException(SR.Format(SR.Arg_MemberInfoNotFound, member.Name), nameof(member));

return result;
}

private M QueryMemberWithSameMetadataDefinitionAs<M>(MemberInfo member) where M : MemberInfo
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Reflection/tests/TypeInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,7 @@ private static (Type, Type) CreateGeneratedTypes()
}

[Theory, MemberData(nameof(GetMemberWithSameMetadataDefinitionAsData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/67533", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
public void GetMemberWithSameMetadataDefinitionAs(Type openGenericType, Type closedGenericType, bool checkDeclaringType)
{
BindingFlags all = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance | BindingFlags.DeclaredOnly;
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,6 @@
<!-- Run only a small randomly chosen set of passing test suites -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" />
<ProjectExclusions Remove="$(MSBuildThisFileDirectory)System.Collections\tests\System.Collections.Tests.csproj" />
<ProjectExclusions Remove="$(MSBuildThisFileDirectory)System.Reflection\tests\System.Reflection.Tests.csproj" />
<ProjectExclusions Remove="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down