Skip to content

Commit 4802a7f

Browse files
authored
Merge pull request #2 from davidwrighton/AsyncR2RTweaks
Adjustment to get the compiler to finish the jitting
2 parents 0e6d23c + a828d07 commit 4802a7f

5 files changed

Lines changed: 169 additions & 47 deletions

File tree

src/coreclr/tools/Common/JitInterface/AsyncMethodDesc.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ namespace Internal.JitInterface
1010
/// <summary>
1111
/// Represents the async-callable (CORINFO_CALLCONV_ASYNCCALL) variant of a Task/ValueTask returning method.
1212
/// The wrapper should be short‑lived and only used while interacting with the JIT interface.
13+
/// NOPE: These things aren't short lived in R2R scenarios. Please make a normal method, and give them normal, long lifetimes
1314
/// </summary>
1415
internal sealed class AsyncMethodDesc : MethodDelegator, IJitHashableOnly
1516
{

src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRunCodegenNodeFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,8 @@ public void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph, I
708708
ManifestMetadataTable = new ManifestMetadataTableNode(this);
709709
Header.Add(Internal.Runtime.ReadyToRunSectionType.ManifestMetadata, ManifestMetadataTable, ManifestMetadataTable);
710710
Resolver.SetModuleIndexLookup(ManifestMetadataTable.ModuleToIndex);
711-
((ReadyToRunILProvider)ilProvider).InitManifestMutableModule(ManifestMetadataTable._mutableModule);
712711
Resolver.InitManifestMutableModule(ManifestMetadataTable._mutableModule);
712+
((ReadyToRunILProvider)ilProvider).InitManifestMutableModule(ManifestMetadataTable._mutableModule, Resolver);
713713

714714
ManifestAssemblyMvidHeaderNode mvidTableNode = new ManifestAssemblyMvidHeaderNode(ManifestMetadataTable);
715715
Header.Add(Internal.Runtime.ReadyToRunSectionType.ManifestAssemblyMvids, mvidTableNode, mvidTableNode);

0 commit comments

Comments
 (0)