MethodAnalysisContext improvements

Cpp2IL.Core/CorePlugin/AttributeInjectorProcessingLayer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
@@ -80,14 +80,14 @@ private static void InjectAddressAttribute(ApplicationAnalysisContext appContext
 
             foreach (var m in assemblyAnalysisContext.Types.SelectMany(t => t.Methods))
             {
-                if (m.CustomAttributes == null || m.Definition == null)
+                if (m.CustomAttributes == null || m.UnderlyingPointer == 0)
                     continue;
 
                 var newAttribute = new AnalyzedCustomAttribute(addressConstructor);
 
                 if (!_useEzDiffMode)
                 {
-                    newAttribute.Fields.Add(new(rvaField, new CustomAttributePrimitiveParameter($"0x{m.Definition.Rva:X}", newAttribute, CustomAttributeParameterKind.Field, 0)));
+                    newAttribute.Fields.Add(new(rvaField, new CustomAttributePrimitiveParameter($"0x{m.Rva:X}", newAttribute, CustomAttributeParameterKind.Field, 0)));
                     if (appContext.Binary.TryMapVirtualAddressToRaw(m.UnderlyingPointer, out var offset))
                         newAttribute.Fields.Add(new(offsetField, new CustomAttributePrimitiveParameter($"0x{offset:X}", newAttribute, CustomAttributeParameterKind.Field, 1)));
                 }

Cpp2IL.Core/CorePlugin/CallAnalysisProcessingLayer.cs

@@ -59,7 +59,7 @@ private static void InjectAttribute(ApplicationAnalysisContext appContext)
             foreach (var m in assemblyAnalysisContext.Types.SelectMany(t => t.Methods))
             {
                 m.AnalyzeCustomAttributeData();
-                if (m.CustomAttributes == null || m.Definition == null)
+                if (m.CustomAttributes == null || m.UnderlyingPointer == 0)
                     continue;
 
                 if (appContext.MethodsByAddress.TryGetValue(m.UnderlyingPointer, out var methodsWithThatAddress) && methodsWithThatAddress.Count > 1)
@@ -73,11 +73,12 @@ private static void InjectAttribute(ApplicationAnalysisContext appContext)
                 }
                 catch
                 {
+                    m.ConvertedIsil = null;
                     AttributeInjectionUtils.AddZeroParameterAttribute(m, analysisFailedConstructor);
                     continue;
                 }
 
-                if (m.ConvertedIsil is null or { Count: 0 })
+                if (m.ConvertedIsil is { Count: 0 })
                 {
                     if ((m.MethodAttributes & MethodAttributes.Abstract) == 0)
                     {
@@ -135,7 +136,7 @@ private static void InjectAttribute(ApplicationAnalysisContext appContext)
 
             foreach (var m in assemblyAnalysisContext.Types.SelectMany(t => t.Methods))
             {
-                if (m.CustomAttributes == null || m.Definition == null)
+                if (m.CustomAttributes == null || m.UnderlyingPointer == 0)
                     continue;
 
                 var unknownCallCount = unknownCalls.GetOrDefault(m, 0);

Cpp2IL.Core/Model/Contexts/ApplicationAnalysisContext.cs

@@ -163,7 +163,7 @@ public BaseKeyFunctionAddresses GetOrCreateKeyFunctionAddresses()
         return _keyFunctionAddresses;
     }
 
-    public MultiAssemblyInjectedType InjectTypeIntoAllAssemblies(string ns, string name, TypeAnalysisContext baseType)
+    public MultiAssemblyInjectedType InjectTypeIntoAllAssemblies(string ns, string name, TypeAnalysisContext? baseType)
     {
         var types = Assemblies.Select(a => (InjectedTypeAnalysisContext)a.InjectType(ns, name, baseType)).ToArray();
 

Cpp2IL.Core/Model/Contexts/InjectedMethodAnalysisContext.cs

@@ -1,9 +1,11 @@
-using System.Reflection;
+using System.Reflection;
 
 namespace Cpp2IL.Core.Model.Contexts;
 
 public class InjectedMethodAnalysisContext : MethodAnalysisContext
 {
+    public override ulong UnderlyingPointer => 0;
+
     public override string DefaultName { get; }
 
     public override bool IsStatic { get; }
@@ -25,4 +27,4 @@ public InjectedMethodAnalysisContext(TypeAnalysisContext parent, string name, bo
             Parameters.Add(new InjectedParameterAnalysisContext(injectedParameterName, injectedParameterType, this));
         }
     }
-}
+}

Cpp2IL.Core/Model/Contexts/MethodAnalysisContext.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using Cpp2IL.Core.Graphs;
 using Cpp2IL.Core.ISIL;
 using Cpp2IL.Core.Utils;
+using LibCpp2IL;
 using LibCpp2IL.BinaryStructures;
 using LibCpp2IL.Metadata;
 using StableNameDotNet.Providers;
@@ -35,6 +37,8 @@ public class MethodAnalysisContext : HasCustomAttributesAndName, IMethodInfoProv
     /// </summary>
     public virtual ulong UnderlyingPointer => Definition?.MethodPointer ?? throw new("Subclasses of MethodAnalysisContext should override UnderlyingPointer");
 
+    public ulong Rva => UnderlyingPointer == 0 || LibCpp2IlMain.Binary == null ? 0 : LibCpp2IlMain.Binary.GetRva(UnderlyingPointer);
+
     /// <summary>
     /// The raw method body as machine code in the active instruction set.
     /// </summary>
@@ -52,6 +56,9 @@ public class MethodAnalysisContext : HasCustomAttributesAndName, IMethodInfoProv
 
     public List<ParameterAnalysisContext> Parameters = new();
 
+    /// <summary>
+    /// Does this method return void?
+    /// </summary>
     public virtual bool IsVoid => (Definition?.ReturnType?.ToString() ?? throw new("Subclasses of MethodAnalysisContext should override IsVoid")) == "System.Void";
 
     public virtual bool IsStatic => Definition?.IsStatic ?? throw new("Subclasses of MethodAnalysisContext should override IsStatic");
@@ -101,11 +108,18 @@ protected MethodAnalysisContext(ApplicationAnalysisContext context) : base(0, co
         RawBytes = Array.Empty<byte>();
     }
 
+    [MemberNotNull(nameof(ConvertedIsil))]
     public void Analyze()
     {
-        if(UnderlyingPointer == 0)
+        if (ConvertedIsil != null)
+            return;
+
+        if (UnderlyingPointer == 0)
+        {
+            ConvertedIsil = new(0);
             return;
-
+        }
+
         ConvertedIsil = AppContext.InstructionSet.GetIsilFromMethod(this);
 
         if (ConvertedIsil.Count == 0)