Skip to content

Harvest signatures of methods being compiled by the token resolver #57366

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
Aug 14, 2021
Merged

Harvest signatures of methods being compiled by the token resolver #57366

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
5 changes: 5 additions & 0 deletions ...s/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ModuleTokenResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ public void AddModuleTokenForMethod(MethodDesc method, ModuleToken token)
AddModuleTokenForType(owningType, new ModuleToken(token.Module, owningTypeHandle));
memberRef.DecodeMethodSignature<DummyTypeInfo, ModuleTokenResolver>(new TokenResolverProvider(this, token.Module), this);
}
if (token.TokenType == CorTokenType.mdtMethodDef)
{
MethodDefinition methodDef = token.MetadataReader.GetMethodDefinition((MethodDefinitionHandle)token.Handle);
methodDef.DecodeSignature<DummyTypeInfo, ModuleTokenResolver>(new TokenResolverProvider(this, token.Module), this);
}
}

private void AddModuleTokenForFieldReference(TypeDesc owningType, ModuleToken token)
Expand Down
6 changes: 6 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,12 @@ public void CompileMethod(MethodWithGCInfo methodCodeNodeNeedingCode, Logger log
{
if (!FunctionJustThrows(methodIL))
{
if (MethodBeingCompiled.GetTypicalMethodDefinition() is EcmaMethod ecmaMethod)
{
// Harvest the method being compiled for the purpose of populating the type resolver
var resolver = _compilation.NodeFactory.Resolver;
resolver.AddModuleTokenForMethod(MethodBeingCompiled, new ModuleToken(ecmaMethod.Module, ecmaMethod.Handle));
}
CompileMethodInternal(methodCodeNodeNeedingCode, methodIL);
codeGotPublished = true;
}
Expand Down