Core: DummyDll: Fix API consumers getting bad value types...

If types were defined out-of-order in the metadata, and anyone tried to use the generated assembly refs without saving the assemblies to disk first, some value types could be referenced not as value types, which was incorrect. Ensure we configure the hierarchy for VTs and Enums early to prevent this.

Author: SamboyCoding

Cpp2IL.Core/CorePlugin/AsmResolverDummyDllOutputFormat.cs

@@ -79,8 +79,6 @@ public List<AssemblyDefinition> BuildAssemblies(ApplicationAnalysisContext conte
         List<AssemblyDefinition> ret = BuildStubAssemblies(context);
         Logger.VerboseNewline($"{(DateTime.Now - start).TotalMilliseconds:F1}ms", "DummyDllOutput");
 
-        TypeDefinitionsAsmResolver.CacheNeededTypeDefinitions();
-
         start = DateTime.Now;
         Logger.Verbose("Configuring inheritance and generics...", "DummyDllOutput");
 
@@ -173,6 +171,24 @@ private static AssemblyDefinition BuildStubAssembly(AssemblyAnalysisContext asse
                 managedModule.TopLevelTypes.Add(BuildStubType(il2CppTypeDefinition));
         }
 
+        if (corLib == null)
+        {
+            //We *are* the corlib, so cache defs now
+            TypeDefinitionsAsmResolver.CacheNeededTypeDefinitions();
+        }
+        
+        //We can get issues with consumers of the API if the base type is not set correctly for value types or enums, so we set it here (as early as possible) if we can
+        foreach (var assemblyContextType in assemblyContext.Types)
+        {
+            if(assemblyContextType.Definition is not {} def || assemblyContextType.GetExtraData<TypeDefinition>("AsmResolverType") is not {} asmResolverType)
+                continue;
+            
+            if(def.IsValueType)
+                asmResolverType.BaseType = managedModule.DefaultImporter.ImportType(TypeDefinitionsAsmResolver.ValueType);
+            else if(def.IsEnumType)
+                asmResolverType.BaseType = managedModule.DefaultImporter.ImportType(TypeDefinitionsAsmResolver.Enum);
+        }
+
         //Store the managed assembly in the context so we can use it later.
         assemblyContext.PutExtraData("AsmResolverAssembly", ourAssembly);
 
@@ -227,4 +243,4 @@ private static void ConfigureTypeSize(Il2CppTypeDefinition il2CppDefinition, Typ
         if (packingSize != 0 || classSize != 0)
             asmResolverDefinition.ClassLayout = new(packingSize, classSize);
     }
-}
+}

Cpp2IL.Core/Utils/AsmResolver/TypeDefinitionsAsmResolver.cs

@@ -28,6 +28,7 @@ public static class TypeDefinitionsAsmResolver
         public static TypeDefinition Object;
         public static TypeDefinition IConvertible;
         public static TypeDefinition ValueType;
+        public static TypeDefinition Enum;
         public static TypeDefinition Type;
         public static TypeDefinition TypedReference;
         public static TypeDefinition String;
@@ -42,6 +43,35 @@ public static class TypeDefinitionsAsmResolver
         public static void Reset()
         {
             _primitiveTypeMappings.Clear();
+            
+            Boolean = null!;
+            SByte = null!;
+            Byte = null!;
+            Char = null!;
+            Int16 = null!;
+            UInt16 = null!;
+            Int32 = null!;
+            UInt32 = null!;
+            Int64 = null!;
+            UInt64 = null!;
+            Single = null!;
+            Double = null!;
+            IntPtr = null!;
+            UIntPtr = null!;
+            
+            Object = null!;
+            IConvertible = null!;
+            ValueType = null!;
+            Enum = null!;
+            Type = null!;
+            TypedReference = null!;
+            String = null!;
+            Array = null!;
+            IEnumerable = null!;
+            Exception = null!;
+            Void = null!;
+            Attribute = null!;
+            MethodInfo = null!;
         }
 
         public static TypeDefinition? GetPrimitive(string name)
@@ -56,6 +86,7 @@ public static void CacheNeededTypeDefinitions()
         {
             Object = AsmResolverUtils.TryLookupTypeDefKnownNotGeneric("System.Object")!;
             ValueType = AsmResolverUtils.TryLookupTypeDefKnownNotGeneric("System.ValueType")!;
+            Enum = AsmResolverUtils.TryLookupTypeDefKnownNotGeneric("System.Enum")!;
             String = AsmResolverUtils.TryLookupTypeDefKnownNotGeneric("System.String")!;
             Int64 = AsmResolverUtils.TryLookupTypeDefKnownNotGeneric("System.Int64")!;
             Single = AsmResolverUtils.TryLookupTypeDefKnownNotGeneric("System.Single")!;
@@ -96,4 +127,4 @@ public static void CacheNeededTypeDefinitions()
             };
         }
     }
-}
+}