Fix Invalid Generic Parameter Names

BepInEx · Sep 13, 2024 · 7cddab8 · 7cddab8
1 parent 18ef1e5
commit 7cddab8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs b/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs
@@ -76,6 +76,9 @@ public MethodRewriteContext(TypeRewriteContext declaringType, MethodDefinition o
                 var genericParameter = new GenericParameter(oldParameter.Name);
                 genericParameter.Attributes = oldParameter.Attributes.StripValueTypeConstraint();
                 newMethod.GenericParameters.Add(genericParameter);
+
+                if (genericParameter.Name.IsInvalidInSource())
+                    genericParameter.Name = genericParameter.Name.FilterInvalidInSourceChars();
             }
         }
 
@@ -135,6 +138,8 @@ public void CtorPhase2()
             {
                 var oldParameter = genericParams[index];
                 var genericParameter = new GenericParameter(oldParameter.Name);
+                if (genericParameter.Name.IsInvalidInSource())
+                    genericParameter.Name = genericParameter.Name.FilterInvalidInSourceChars();
                 genericMethodInfoStoreType.GenericParameters.Add(genericParameter);
                 selfSubstRef.TypeArguments.Add(genericParameter.ToTypeSignature());
                 var newParameter = NewMethod.GenericParameters[index];

diff --git a/Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs b/Il2CppInterop.Generator/Contexts/RewriteGlobalContext.cs
@@ -137,6 +137,9 @@ public AssemblyRewriteContext GetAssemblyByName(string name)
             {
                 var newGenericParameter = new GenericParameter(genericParameter.Name, genericParameter.Attributes);
 
+                if (newGenericParameter.Name.IsInvalidInSource())
+                    newGenericParameter.Name = newGenericParameter.Name.FilterInvalidInSourceChars();
+
                 foreach (var constraint in genericParameter.Constraints)
                 {
                     var newConstraintType = constraint.Constraint != null ? resolve(constraint.Constraint.ToTypeSignature())?.ToTypeDefOrRef() : null;

diff --git a/Il2CppInterop.Generator/Passes/Pass12FillTypedefs.cs b/Il2CppInterop.Generator/Passes/Pass12FillTypedefs.cs
@@ -15,6 +15,8 @@ public static void DoPass(RewriteGlobalContext context)
                 foreach (var originalParameter in typeContext.OriginalType.GenericParameters)
                 {
                     var newParameter = new GenericParameter(originalParameter.Name);
+                    if (newParameter.Name.IsInvalidInSource())
+                        newParameter.Name = newParameter.Name.FilterInvalidInSourceChars();
                     typeContext.NewType.GenericParameters.Add(newParameter);
                     newParameter.Attributes = originalParameter.Attributes.StripValueTypeConstraint();
                 }