Looser filtering on <Module> type name (#233)

SamboyCoding · Aug 30, 2023 · ef427a9 · ef427a9
1 parent 4e8264a
commit ef427a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Cpp2IL.Core/Utils/AsmResolver/AsmResolverAssemblyPopulator.cs b/Cpp2IL.Core/Utils/AsmResolver/AsmResolverAssemblyPopulator.cs
@@ -16,11 +16,16 @@ namespace Cpp2IL.Core.Utils.AsmResolver;
 
 public static class AsmResolverAssemblyPopulator
 {
+    public static bool IsTypeContextModule(TypeAnalysisContext typeCtx)
+    {
+        return typeCtx.Name.StartsWith("<Module>") || typeCtx.FullName.StartsWith("<Module>");
+    }
+
     public static void ConfigureHierarchy(AssemblyAnalysisContext asmCtx)
     {
         foreach (var typeCtx in asmCtx.Types)
         {
-            if (typeCtx.Name == "<Module>")
+            if (IsTypeContextModule(typeCtx))
                 continue;
 
             var il2CppTypeDef = typeCtx.Definition;
@@ -242,7 +247,7 @@ public static void PopulateCustomAttributes(AssemblyAnalysisContext asmContext)
 
             foreach (var type in asmContext.Types)
             {
-                if (type.Name == "<Module>")
+                if (IsTypeContextModule(type))
                     continue;
 
                 CopyCustomAttributes(type, type.GetExtraData<TypeDefinition>("AsmResolverType")!.CustomAttributes);
@@ -282,7 +287,7 @@ public static void CopyDataFromIl2CppToManaged(AssemblyAnalysisContext asmContex
 
         foreach (var typeContext in asmContext.Types)
         {
-            if (typeContext.Name == "<Module>")
+            if (IsTypeContextModule(typeContext))
                 continue;
 
             var managedType = typeContext.GetExtraData<TypeDefinition>("AsmResolverType") ?? throw new($"AsmResolver type not found in type analysis context for {typeContext.Definition?.FullName}");

diff --git a/Cpp2IL.Core/Utils/AsmResolver/AsmResolverMethodFiller.cs b/Cpp2IL.Core/Utils/AsmResolver/AsmResolverMethodFiller.cs
@@ -14,7 +14,7 @@ public static void FillManagedMethodBodies(AssemblyAnalysisContext asmContext)
     {
         foreach (var typeContext in asmContext.Types)
         {
-            if (typeContext.Name == "<Module>")
+            if (AsmResolverAssemblyPopulator.IsTypeContextModule(typeContext))
                 continue;
 
 #if !DEBUG