Dont use the assembly name for resolution

Author: ds5678

Cpp2IL.Core/Model/Contexts/ApplicationAnalysisContext.cs

@@ -78,6 +78,8 @@ public class ApplicationAnalysisContext : ContextWithDataStorage
  /// </summary>
  public bool HasFinishedInitializing { get; private set; }
 
+ private readonly Dictionary<Il2CppImageDefinition, AssemblyAnalysisContext> AssembliesByImageDefinition = new();
+
  public ApplicationAnalysisContext(Il2CppBinary binary, Il2CppMetadata metadata)
  {
  Binary = binary;
@@ -100,6 +102,7 @@ public ApplicationAnalysisContext(Il2CppBinary binary, Il2CppMetadata metadata)
  var aac = new AssemblyAnalysisContext(assemblyDefinition, this);
  Assemblies.Add(aac);
  AssembliesByName[assemblyDefinition.AssemblyName.Name] = aac;
+ AssembliesByImageDefinition[assemblyDefinition.Image] = aac;
  }
 
  SystemTypes = new(this);
@@ -170,10 +173,22 @@ private void PopulateMethodsByAddressTable()
  return AssembliesByName[name];
  }
 
+ public AssemblyAnalysisContext? ResolveContextForAssembly(Il2CppImageDefinition? imageDefinition)
+ {
+ return imageDefinition is not null
+ ? AssembliesByImageDefinition[imageDefinition]
+ : null;
+ }
+
+ public AssemblyAnalysisContext? ResolveContextForAssembly(Il2CppAssemblyDefinition? assemblyDefinition)
+ {
+ return ResolveContextForAssembly(assemblyDefinition?.Image);
+ }
+
  public TypeAnalysisContext? ResolveContextForType(Il2CppTypeDefinition? typeDefinition)
  {
  return typeDefinition is not null
- ? GetAssemblyByName(typeDefinition.DeclaringAssembly!.Name!)?.GetTypeByDefinition(typeDefinition)
+ ? AssembliesByImageDefinition[typeDefinition.DeclaringAssembly!].GetTypeByDefinition(typeDefinition)
  : null;
  }
 

Cpp2IL.Core/Model/Contexts/ConcreteGenericMethodAnalysisContext.cs

@@ -121,8 +121,8 @@ private ConcreteGenericMethodAnalysisContext(Cpp2IlMethodRef? methodRef, MethodA
 
  private static AssemblyAnalysisContext ResolveDeclaringAssembly(Cpp2IlMethodRef methodRef, ApplicationAnalysisContext context)
  {
- return context.GetAssemblyByName(methodRef.DeclaringType.DeclaringAssembly!.Name!)
- ?? throw new($"Unable to resolve declaring assembly {methodRef.DeclaringType.DeclaringAssembly.Name} for generic method {methodRef}");
+ return context.ResolveContextForAssembly(methodRef.DeclaringType.DeclaringAssembly)
+ ?? throw new($"Unable to resolve declaring assembly {methodRef.DeclaringType.DeclaringAssembly?.Name} for generic method {methodRef}");
  }
 
  private static TypeAnalysisContext ResolveDeclaringType(Cpp2IlMethodRef methodRef, AssemblyAnalysisContext declaringAssembly)