Skip to content

Looser filtering on <Module> type name #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Looser filtering on <Module> type name #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Cpp2IL.Core/Utils/AsmResolver/AsmResolverAssemblyPopulator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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}");
Expand Down
2 changes: 1 addition & 1 deletion Cpp2IL.Core/Utils/AsmResolver/AsmResolverMethodFiller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down