Skip to content

Ensure methods on different instantiations are reflectable #73749

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
MichalStrehovsky merged 2 commits into from
Aug 11, 2022
Merged

Ensure methods on different instantiations are reflectable #73749

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
ef2af45
wip
MichalStrehovsky Aug 11, 2022
d2efdf9
Regression test
MichalStrehovsky Aug 11, 2022
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
21 changes: 19 additions & 2 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedMetadataManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,9 @@ public override void GetConditionalDependenciesDueToEETypePresence(ref CombinedD
// ObjectGetTypeFlowDependencies don't need to be conditional in that case. They'll be added as needed.
}

// Ensure fields can be consistently reflection set & get.
if (type.HasInstantiation && !type.IsTypeDefinition && !IsReflectionBlocked(type))
{
// Ensure fields can be consistently reflection set & get.
foreach (FieldDesc field in type.GetFields())
{
// Tiny optimization: no get/set for literal fields since they only exist in metadata
Expand All @@ -481,7 +481,24 @@ public override void GetConditionalDependenciesDueToEETypePresence(ref CombinedD
dependencies.Add(new DependencyNodeCore<NodeFactory>.CombinedDependencyListEntry(
factory.ReflectableField(field),
factory.ReflectableField(field.GetTypicalFieldDefinition()),
"GetType called on the interface"));
"Fields have same reflectability"));
}

// Ensure methods can be consistently reflection-accessed
foreach (MethodDesc method in type.GetMethods())
{
if (IsReflectionBlocked(method))
continue;

// Generic methods need to be instantiated over something.
if (method.HasInstantiation)
continue;

dependencies ??= new CombinedDependencyList();
dependencies.Add(new DependencyNodeCore<NodeFactory>.CombinedDependencyListEntry(
factory.ReflectableMethod(method),
factory.ReflectableMethod(method.GetTypicalMethodDefinition()),
"Methods have same reflectability"));
}
}
}
Expand Down
20 changes: 20 additions & 0 deletions src/tests/nativeaot/SmokeTests/Reflection/Reflection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ private static int Main()
TestInvokeMethodMetadata.Run();
TestVTableOfNullableUnderlyingTypes.Run();
TestInterfaceLists.Run();
TestMethodConsistency.Run();

//
// Mostly functionality tests
Expand Down Expand Up @@ -2021,6 +2022,25 @@ public static void Run()
}
}

class TestMethodConsistency
{
class MyGenericType<T>
{
public static string MyMethod() => typeof(T).Name;
}

struct Atom { }

public static void Run()
{
object returned = Grab<Atom>().Invoke(null, null);
if ((string)returned != nameof(Atom))
throw new Exception();

static MethodInfo Grab<T>() => typeof(MyGenericType<T>).GetMethod(nameof(MyGenericType<T>.MyMethod));
}
}

#region Helpers

private static Type SecretGetType(string testName, string typeName)
Expand Down