Skip to content

Consider all MemberInfo references for IsCollectible #119869

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 1 commit into from
Sep 19, 2025
Merged

Consider all MemberInfo references for IsCollectible #119869

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
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public override IList<CustomAttributeData> GetCustomAttributesData()
internal RuntimeType GetRuntimeType() { return m_declaringType; }
internal RuntimeModule GetRuntimeModule() { return RuntimeTypeHandle.GetModule(m_declaringType); }
internal RuntimeAssembly GetRuntimeAssembly() { return GetRuntimeModule().GetRuntimeAssembly(); }
public override bool IsCollectible => m_declaringType.IsCollectible;
public override bool IsCollectible => ReflectedTypeInternal.IsCollectible;
#endregion

#region MethodBase Overrides
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeEventInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public override IList<CustomAttributeData> GetCustomAttributesData()
public override int MetadataToken => m_token;
public override Module Module => GetRuntimeModule();
internal RuntimeModule GetRuntimeModule() { return m_declaringType.GetRuntimeModule(); }
public override bool IsCollectible => m_declaringType.IsCollectible;
public override bool IsCollectible => ReflectedTypeInternal.IsCollectible;
#endregion

#region EventInfo Overrides
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal RuntimeType GetDeclaringTypeInternal()
public sealed override bool HasSameMetadataDefinitionAs(MemberInfo other) => HasSameMetadataDefinitionAsCore<RuntimeFieldInfo>(other);

public override Module Module => GetRuntimeModule();
public override bool IsCollectible => m_declaringType.IsCollectible;
public override bool IsCollectible => ReflectedTypeInternal.IsCollectible;

#endregion

Expand Down
3 changes: 3 additions & 0 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ public override bool IsCollectible
{
get
{
if (ReflectedTypeInternal.IsCollectible)
return true;

bool isCollectible = RuntimeMethodHandle.IsCollectible(new RuntimeMethodHandleInternal(m_handle));
GC.KeepAlive(this); // We directly pass the native handle above - make sure this object stays alive for the call
return isCollectible;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimePropertyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public override IList<CustomAttributeData> GetCustomAttributesData()

public override Module Module => GetRuntimeModule();
internal RuntimeModule GetRuntimeModule() { return m_declaringType.GetRuntimeModule(); }
public override bool IsCollectible => m_declaringType.IsCollectible;
public override bool IsCollectible => ReflectedTypeInternal.IsCollectible;

public override bool Equals(object? obj) =>
ReferenceEquals(this, obj) ||
Expand Down
103 changes: 42 additions & 61 deletions ...braries/System.Runtime/tests/System.Runtime.Tests/System/Reflection/IsCollectibleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,10 @@ public void Assembly_IsCollectibleTrue_WhenUsingTestAssemblyLoadContext()
}).Dispose();
}

[ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
[InlineData("MyField")]
[InlineData("MyProperty")]
[InlineData("MyMethod")]
[InlineData("MyGenericMethod")]
[InlineData("MyStaticMethod")]
[InlineData("MyStaticField")]
[InlineData("MyStaticGenericMethod")]
public void MemberInfo_IsCollectibleFalse_WhenUsingAssemblyLoad(string memberName)
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void MemberInfo_IsCollectibleFalse_WhenUsingAssemblyLoad()
{
RemoteExecutor.Invoke((marshalledName) =>
RemoteExecutor.Invoke(() =>
{
Type t1 = Type.GetType(
"TestCollectibleAssembly.MyTestClass, TestCollectibleAssembly, Version=1.0.0.0",
Expand All @@ -153,25 +146,18 @@ public void MemberInfo_IsCollectibleFalse_WhenUsingAssemblyLoad(string memberNam

Assert.NotNull(t1);

var member = t1.GetMember(marshalledName).FirstOrDefault();

Assert.NotNull(member);
foreach (var member in t1.GetMembers(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
{
Assert.False(member.IsCollectible, member.ToString());
}

Assert.False(member.IsCollectible);
}, memberName).Dispose();
}).Dispose();
}

[ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
[InlineData("MyStaticGenericField")]
[InlineData("MyStaticField")]
[InlineData("MyStaticGenericMethod")]
[InlineData("MyStaticMethod")]
[InlineData("MyGenericField")]
[InlineData("MyGenericProperty")]
[InlineData("MyGenericMethod")]
public void MemberInfoGeneric_IsCollectibleFalse_WhenUsingAssemblyLoad(string memberName)
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void MemberInfoGeneric_IsCollectibleFalse_WhenUsingAssemblyLoad()
{
RemoteExecutor.Invoke((marshalledName) =>
RemoteExecutor.Invoke(() =>
{
Type t1 = Type.GetType(
"TestCollectibleAssembly.MyGenericTestClass`1[System.Int32], TestCollectibleAssembly, Version=1.0.0.0",
Expand All @@ -182,25 +168,18 @@ public void MemberInfoGeneric_IsCollectibleFalse_WhenUsingAssemblyLoad(string me

Assert.NotNull(t1);

var member = t1.GetMember(marshalledName).FirstOrDefault();

Assert.NotNull(member);
foreach (var member in t1.GetMembers(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
{
Assert.False(member.IsCollectible, member.ToString());
}

Assert.False(member.IsCollectible);
}, memberName).Dispose();
}).Dispose();
}

[ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
[InlineData("MyField")]
[InlineData("MyProperty")]
[InlineData("MyMethod")]
[InlineData("MyGenericMethod")]
[InlineData("MyStaticMethod")]
[InlineData("MyStaticField")]
[InlineData("MyStaticGenericMethod")]
public void MemberInfo_IsCollectibleTrue_WhenUsingAssemblyLoadContext(string memberName)
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void MemberInfo_IsCollectibleTrue_WhenUsingAssemblyLoadContext()
{
RemoteExecutor.Invoke((marshalledName) =>
RemoteExecutor.Invoke(() =>
{
AssemblyLoadContext alc = new TestAssemblyLoadContext();

Expand All @@ -213,25 +192,18 @@ public void MemberInfo_IsCollectibleTrue_WhenUsingAssemblyLoadContext(string mem

Assert.NotNull(t1);

var member = t1.GetMember(marshalledName).FirstOrDefault();

Assert.NotNull(member);
foreach (var member in t1.GetMembers(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
{
Assert.True(member.IsCollectible, member.ToString());
}

Assert.True(member.IsCollectible);
}, memberName).Dispose();
}).Dispose();
}

[ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
[InlineData("MyStaticGenericField")]
[InlineData("MyStaticField")]
[InlineData("MyStaticGenericMethod")]
[InlineData("MyStaticMethod")]
[InlineData("MyGenericField")]
[InlineData("MyGenericProperty")]
[InlineData("MyGenericMethod")]
public void MemberInfoGeneric_IsCollectibleTrue_WhenUsingAssemblyLoadContext(string memberName)
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void MemberInfoGeneric_IsCollectibleTrue_WhenUsingAssemblyLoadContext()
{
RemoteExecutor.Invoke((marshalledName) =>
RemoteExecutor.Invoke(() =>
{
AssemblyLoadContext alc = new TestAssemblyLoadContext();

Expand All @@ -244,12 +216,12 @@ public void MemberInfoGeneric_IsCollectibleTrue_WhenUsingAssemblyLoadContext(str

Assert.NotNull(t1);

var member = t1.GetMember(marshalledName).FirstOrDefault();
foreach (var member in t1.GetMembers(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
{
Assert.True(member.IsCollectible, member.ToString());
}

Assert.NotNull(member);

Assert.True(member.IsCollectible);
}, memberName).Dispose();
}).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand All @@ -268,7 +240,16 @@ public void GenericWithCollectibleTypeParameter_IsCollectibleTrue_WhenUsingAssem

Assert.NotNull(t1);

Assert.True(t1.IsCollectible);
foreach (var member in t1.GetMembers(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
{
if (member is Type)
{
continue;
}

Assert.True(member.IsCollectible, member.ToString());
}

}).Dispose();
}
}
Expand Down