Requested changes

BepInEx · Sep 22, 2024 · 86a90f5 · 86a90f5
1 parent 4105261
commit 86a90f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Il2CppInterop.Generator/Passes/Pass19CopyMethodParameters.cs b/Il2CppInterop.Generator/Passes/Pass19CopyMethodParameters.cs
@@ -26,7 +26,7 @@ public static void DoPass(RewriteGlobalContext context)
                         var newParameter = newMethod.AddParameter(
                             assemblyContext.RewriteTypeRef(originalMethodParameter.ParameterType),
                             newName,
-                            originalMethodParameter.Definition!.Attributes & ~ParameterAttributes.HasFieldMarshal);
+                            originalMethodParameter.GetOrCreateDefinition().Attributes & ~ParameterAttributes.HasFieldMarshal);
 
                         if (originalMethodParameter.IsParamsArray())
                         {
@@ -35,7 +35,7 @@ public static void DoPass(RewriteGlobalContext context)
                         }
                         else
                         {
-                            newParameter.Definition!.Constant = originalMethodParameter.Definition.Constant;
+                            newParameter.Definition!.Constant = originalMethodParameter.Definition!.Constant;
                         }
                     }
 

diff --git a/Il2CppInterop.Generator/Passes/Pass90WriteToDisk.cs b/Il2CppInterop.Generator/Passes/Pass90WriteToDisk.cs
@@ -49,12 +49,13 @@ public static void DoPass(RewriteGlobalContext context, GeneratorOptions options
                 asmContext.NewAssembly.CustomAttributes.Add(targetFrameworkAttribute);
             }
 
-            // Optimize macros in all methods.
+            // Optimize macros in all methods and assign tokens.
             foreach (var type in module.GetAllTypes())
             {
                 foreach (var method in type.Methods)
                 {
                     method.CilMethodBody?.Instructions.OptimizeMacros();
+                    module.TokenAllocator.AssignNextAvailableToken(method);
                 }
             }
         }