Undo additional changes

Author: jtschuster

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

@@ -480,8 +480,8 @@ public IEnumerable<MethodWithGCInfo> EnumerateCompiledMethods(EcmaModule moduleT
 #if DEBUG
                 if ((!methodCodeNode.IsEmpty || CompilationModuleGroup.VersionsWithMethodBody(method)) && method.IsPrimaryMethodDesc())
                 {
-                    EcmaModule module = ((EcmaMethod)method.GetTypicalMethodDefinition().GetPrimaryMethodDesc()).Module;
-                    ModuleToken moduleToken = Resolver.GetModuleTokenForMethod(method.GetPrimaryMethodDesc(), allowDynamicallyCreatedReference: true, throwIfNotFound: true);
+                    EcmaModule module = ((EcmaMethod)method.GetTypicalMethodDefinition()).Module;
+                    ModuleToken moduleToken = Resolver.GetModuleTokenForMethod(method, allowDynamicallyCreatedReference: true, throwIfNotFound: true);
 
                     IMethodNode methodNodeDebug = MethodEntrypoint(new MethodWithToken(method, moduleToken, constrainedType: null, unboxing: false, context: null), false, false, false);
                     MethodWithGCInfo methodCodeNodeDebug = methodNodeDebug as MethodWithGCInfo;

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

@@ -124,49 +124,17 @@ public int CompareTo(FieldWithToken other, TypeSystemComparer comparer)
         }
     }
 
-#nullable enable
     public class MethodWithToken
     {
-        /// <summary>
-        /// The MethodDesc this represents.
-        /// </summary>
         public readonly MethodDesc Method;
-
-        /// <summary>
-        /// The ModuleToken that represents the definition of Method.
-        /// </summary>
         public readonly ModuleToken Token;
-
-        /// <summary>
-        /// For constrained calls, the type that the call is constrained to.
-        /// </summary>
-        public readonly TypeDesc? ConstrainedType;
-
-        /// <summary>
-        /// Whether this method is for an unboxing stub.
-        /// </summary>
+        public readonly TypeDesc ConstrainedType;
         public readonly bool Unboxing;
-
-        /// <summary>
-        /// Indicates whether the owning type is different than indicated by the ModuleToken for the method.
-        /// </summary>
         public readonly bool OwningTypeNotDerivedFromToken;
-
-        /// <summary>
-        /// The type that owns the method instance.
-        /// </summary>
         public readonly TypeDesc OwningType;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="method">The MethodDesc this represents.</param>
-        /// <param name="token">The ModuleToken that represents the definition of <paramref name="method"/></param>
-        /// <param name="constrainedType">For constrained calls, the type that the call is constrained to.</param>
-        /// <param name="unboxing">If the method is an unboxing stub</param>
-        /// <param name="context">A MethodDesc or TypeDesc from which the generic context is determined for finding the owning type.</param>
-        /// <param name="devirtualizedMethodOwner">The type that owns the devirtualized method, if any.</param>
-        public MethodWithToken(MethodDesc method, ModuleToken token, TypeDesc? constrainedType = null, bool unboxing = false, object? context = null, TypeDesc? devirtualizedMethodOwner = null)
+
+        public MethodWithToken(MethodDesc method, ModuleToken token, TypeDesc constrainedType, bool unboxing, object context, TypeDesc devirtualizedMethodOwner = null)
         {
             Debug.Assert(!method.IsUnboxingThunk());
             Method = method;
@@ -176,7 +144,7 @@ public MethodWithToken(MethodDesc method, ModuleToken token, TypeDesc? constrain
             OwningType = GetMethodTokenOwningType(this, constrainedType, context, devirtualizedMethodOwner, out OwningTypeNotDerivedFromToken);
         }
 
-        private static TypeDesc GetMethodTokenOwningType(MethodWithToken methodToken, TypeDesc? constrainedType, object? context, TypeDesc? devirtualizedMethodOwner, out bool owningTypeNotDerivedFromToken)
+        private static TypeDesc GetMethodTokenOwningType(MethodWithToken methodToken, TypeDesc constrainedType, object context, TypeDesc devirtualizedMethodOwner, out bool owningTypeNotDerivedFromToken)
         {
             ModuleToken moduleToken = methodToken.Token;
             owningTypeNotDerivedFromToken = false;
@@ -211,7 +179,7 @@ private static TypeDesc GetMethodTokenOwningType(MethodWithToken methodToken, Ty
                     return methodToken.Method.OwningType;
             }
 
-            TypeDesc HandleContext(IEcmaModule module, EntityHandle handle, TypeDesc methodTargetOwner, TypeDesc? constrainedType, object? context, TypeDesc? devirtualizedMethodOwner, ref bool owningTypeNotDerivedFromToken)
+            TypeDesc HandleContext(IEcmaModule module, EntityHandle handle, TypeDesc methodTargetOwner, TypeDesc constrainedType, object context, TypeDesc devirtualizedMethodOwner, ref bool owningTypeNotDerivedFromToken)
             {
                 var tokenOnlyOwningType = module.GetType(handle);
                 TypeDesc actualOwningType;
@@ -236,7 +204,7 @@ TypeDesc HandleContext(IEcmaModule module, EntityHandle handle, TypeDesc methodT
                         typeInstantiation = typeContext.Instantiation;
                     }
 
-                    TypeDesc? instantiatedOwningType = null;
+                    TypeDesc instantiatedOwningType = null;
 
                     if (devirtualizedMethodOwner != null)
                     {
@@ -336,7 +304,7 @@ TypeDesc ComputeActualOwningType(TypeDesc methodTargetOwner, TypeDesc instantiat
             }
         }
 
-        public override bool Equals(object? obj)
+        public override bool Equals(object obj)
         {
             return obj is MethodWithToken methodWithToken &&
                 Equals(methodWithToken);
@@ -448,7 +416,6 @@ public int CompareTo(MethodWithToken other, TypeSystemComparer comparer)
             return comparer.Compare(OwningType, other.OwningType);
         }
     }
-#nullable restore
 
     public struct GenericContext : IEquatable<GenericContext>
     {
@@ -592,9 +559,7 @@ public static bool ShouldSkipCompilation(InstructionSetSupport instructionSetSup
         public static bool ShouldCodeNotBeCompiledIntoFinalImage(InstructionSetSupport instructionSetSupport, MethodDesc method)
         {
             if (method.IsAsyncVariant())
-            {
                 return false;
-            }
 
             EcmaMethod ecmaMethod = method.GetTypicalMethodDefinition() as EcmaMethod;
 
@@ -1453,12 +1418,12 @@ private ModuleToken HandleToModuleToken(ref CORINFO_RESOLVED_TOKEN pResolvedToke
                     // using instantiation parameters from the MethodDesc entity.
                     resultMethod = resultMethod.GetTypicalMethodDefinition().GetPrimaryMethodDesc();
 
-                    Debug.Assert(resultMethod is EcmaMethod);
-                    if (!_compilation.NodeFactory.CompilationModuleGroup.VersionsWithType(((EcmaMethod)resultMethod).OwningType))
+                    if (!_compilation.NodeFactory.CompilationModuleGroup.VersionsWithType(resultMethod.OwningType))
                     {
                         ModuleToken result = _compilation.NodeFactory.Resolver.GetModuleTokenForMethod(resultMethod, allowDynamicallyCreatedReference: true, throwIfNotFound: true);
                         return result;
                     }
+                    Debug.Assert(resultMethod is EcmaMethod);
                     token = (mdToken)MetadataTokens.GetToken(((EcmaMethod)resultMethod).Handle);
                     module = ((EcmaMethod)resultMethod).Module;
                 }