Skip to content

Commit d638752

Browse files
committed
Fix extra changes
1 parent 13f7d1d commit d638752

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/coreclr/tools/aot/ILCompiler.ReadyToRun/IL/ReadyToRunILProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public interface IMethodTokensAreUseableInCompilation { }
2626

2727
public sealed class ReadyToRunILProvider : ILProvider
2828
{
29-
private ReadyToRunCompilationModuleGroupBase _compilationModuleGroup;
29+
private CompilationModuleGroup _compilationModuleGroup;
3030
private MutableModule _manifestMutableModule;
3131
private int _version = 0;
3232

33-
public ReadyToRunILProvider(ReadyToRunCompilationModuleGroupBase compilationModuleGroup)
33+
public ReadyToRunILProvider(CompilationModuleGroup compilationModuleGroup)
3434
{
3535
_compilationModuleGroup = compilationModuleGroup;
3636
}

src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,8 @@ private ModuleToken HandleToModuleToken(ref CORINFO_RESOLVED_TOKEN pResolvedToke
14201420
Debug.Assert(resultMethod is EcmaMethod);
14211421
if (!_compilation.NodeFactory.CompilationModuleGroup.VersionsWithType(((EcmaMethod)resultMethod).OwningType))
14221422
{
1423-
ModuleToken result = _compilation.NodeFactory.SignatureContext.Resolver.GetModuleTokenForMethod(resultMethod, allowDynamicallyCreatedReference: true, throwIfNotFound: true);
1423+
Debug.Assert(_compilation.NodeFactory.Resolver.IsKnownMutableModuleMethod((EcmaMethod)resultMethod));
1424+
ModuleToken result = _compilation.NodeFactory.Resolver.GetModuleTokenForMethod(resultMethod, allowDynamicallyCreatedReference: true, throwIfNotFound: true);
14241425
return result;
14251426
}
14261427
token = (mdToken)MetadataTokens.GetToken(((EcmaMethod)resultMethod).Handle);
@@ -1444,7 +1445,8 @@ private ModuleToken HandleToModuleToken(ref CORINFO_RESOLVED_TOKEN pResolvedToke
14441445
{
14451446
if (!_compilation.NodeFactory.CompilationModuleGroup.VersionsWithType(ecmaType))
14461447
{
1447-
ModuleToken result = _compilation.NodeFactory.SignatureContext.Resolver.GetModuleTokenForType(ecmaType, allowDynamicallyCreatedReference: true, throwIfNotFound: true);
1448+
Debug.Assert(_compilation.NodeFactory.Resolver.IsKnownMutableModuleType(ecmaType));
1449+
ModuleToken result = _compilation.NodeFactory.Resolver.GetModuleTokenForType(ecmaType, allowDynamicallyCreatedReference: true, throwIfNotFound: true);
14481450
return result;
14491451
}
14501452
token = (mdToken)MetadataTokens.GetToken(ecmaType.Handle);

0 commit comments

Comments
 (0)