Core: Actually populate custom attributes in injector on v29

Author: Sam Byass

Cpp2IL.Core/CorePlugin/AttributeInjectorProcessingLayer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -39,6 +40,9 @@ private static void InjectFieldOffsetAttribute(ApplicationAnalysisContext appCon
 
             foreach (var f in assemblyAnalysisContext.Types.SelectMany(t => t.Fields))
             {
+                if (f.DeclaringType.Name == "FIFJGNHHBKJ")
+                    Debugger.Break();
+
                 if (f.CustomAttributes == null || f.BackingData == null || f.IsStatic)
                     continue;
 
@@ -116,10 +120,25 @@ private static void InjectTokenAttribute(ApplicationAnalysisContext appContext)
 
     private static void InjectAttributeAttribute(ApplicationAnalysisContext appContext)
     {
-        if(LibCpp2IlMain.MetadataVersion >= 29f)
+        if (LibCpp2IlMain.MetadataVersion >= 29f)
+        {
             //All attributes should be fully serializable anyway, as they're stored in metadata
+            //However, we still need to read them all
+            var toAnalyze = appContext.Assemblies.SelectMany(ctx => ctx.Types)
+                .SelectMany(ctx =>
+                    ctx.Methods.SelectMany(m => m.Parameters.Cast<HasCustomAttributes>().Append(m)
+                        .Concat(ctx.Fields)
+                        .Concat(ctx.Events)
+                        .Concat(ctx.Properties)
+                        .Append(ctx)));
+            
+            foreach (var hasCustomAttributes in toAnalyze) 
+                hasCustomAttributes.AnalyzeCustomAttributeData();
+
+            // MiscUtils.ExecuteParallel(toAnalyze, ctx => ctx.AnalyzeCustomAttributeData());
             return;
-        
+        }
+
         var attributeAttributes = appContext.InjectTypeIntoAllAssemblies("Cpp2ILInjected", "AttributeAttribute", appContext.SystemTypes.SystemAttributeType);
 
         var attributeNameFields = attributeAttributes.InjectFieldToAllAssemblies("Name", appContext.SystemTypes.SystemStringType, FieldAttributes.Public);

LibCpp2IL/BinarySearcher.cs

@@ -209,7 +209,7 @@ internal ulong FindCodeRegistrationPost2019()
 
                 if (pCodegenModules.Count == 1)
                 {
-                    LibLogger.Verbose($"\t\t\tOnly found one codegen module pointer, so assuming it's correct and returning pCodeReg = 0x{address:X}");
+                    LibLogger.VerboseNewline($"\t\t\tOnly found one codegen module pointer, so assuming it's correct and returning pCodeReg = 0x{address:X}");
                     return address;
                 }