Special-case System.Enum as a generic constraint (#160)

BepInEx · Sep 10, 2024 · 1eacadb · 1eacadb
1 parent 7a56995
commit 1eacadb
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs b/Il2CppInterop.Generator/Contexts/MethodRewriteContext.cs
@@ -140,8 +140,15 @@ public void CtorPhase2()
 
                 foreach (var oldConstraint in oldParameter.Constraints)
                 {
-                    if (oldConstraint.Constraint?.FullName == "System.ValueType" ||
-                        oldConstraint.Constraint?.Resolve()?.IsInterface == true) continue;
+                    if (oldConstraint.IsSystemValueType() || oldConstraint.IsInterface())
+                        continue;
+
+                    if (oldConstraint.IsSystemEnum())
+                    {
+                        newParameter.Constraints.Add(new GenericParameterConstraint(
+                            DeclaringType.AssemblyContext.Imports.Module.Enum().ToTypeDefOrRef()));
+                        continue;
+                    }
 
                     newParameter.Constraints.Add(new GenericParameterConstraint(
                         DeclaringType.AssemblyContext.RewriteTypeRef(oldConstraint.Constraint?.ToTypeSignature()).ToTypeDefOrRef()));

diff --git a/Il2CppInterop.Generator/Extensions/AsmResolverExtensions.cs b/Il2CppInterop.Generator/Extensions/AsmResolverExtensions.cs
@@ -53,6 +53,12 @@ private static Parameter GetArgument(this ILProcessor instructions, int argument
 
     public static bool IsNested(this TypeSignature type) => type.DeclaringType is not null;
 
+    public static bool IsSystemEnum(this GenericParameterConstraint constraint) => constraint.Constraint?.FullName is "System.Enum";
+
+    public static bool IsSystemValueType(this GenericParameterConstraint constraint) => constraint.Constraint?.FullName is "System.ValueType";
+
+    public static bool IsInterface(this GenericParameterConstraint constraint) => constraint.Constraint?.Resolve()?.IsInterface == true;
+
     public static ITypeDefOrRef? AttributeType(this CustomAttribute attribute) => attribute.Constructor?.DeclaringType;
 
     public static Parameter AddParameter(this MethodDefinition method, TypeSignature parameterSignature, string parameterName, ParameterAttributes parameterAttributes = default)

diff --git a/Il2CppInterop.Generator/Passes/Pass13FillGenericConstraints.cs b/Il2CppInterop.Generator/Passes/Pass13FillGenericConstraints.cs
@@ -1,5 +1,7 @@
 using AsmResolver.DotNet;
 using Il2CppInterop.Generator.Contexts;
+using Il2CppInterop.Generator.Extensions;
+using Il2CppInterop.Generator.Utils;
 
 namespace Il2CppInterop.Generator.Passes;
 
@@ -17,10 +19,16 @@ public static void DoPass(RewriteGlobalContext context)
                     var newParameter = typeContext.NewType.GenericParameters[i];
                     foreach (var originalConstraint in originalParameter.Constraints)
                     {
-                        if (originalConstraint.Constraint?.FullName is "System.ValueType" ||
-                            originalConstraint.Constraint?.Resolve()?.IsInterface == true)
+                        if (originalConstraint.IsSystemValueType() || originalConstraint.IsInterface())
                             continue;
 
+                        if (originalConstraint.IsSystemEnum())
+                        {
+                            newParameter.Constraints.Add(new GenericParameterConstraint(
+                                typeContext.AssemblyContext.Imports.Module.Enum().ToTypeDefOrRef()));
+                            continue;
+                        }
+
                         newParameter.Constraints.Add(
                             new GenericParameterConstraint(
                                 assemblyContext.RewriteTypeRef(originalConstraint.Constraint!)));

diff --git a/Il2CppInterop.Generator/Passes/Pass80UnstripMethods.cs b/Il2CppInterop.Generator/Passes/Pass80UnstripMethods.cs
@@ -77,8 +77,14 @@ public static void DoPass(RewriteGlobalContext context)
                         newParameter.Attributes = unityMethodGenericParameter.Attributes;
                         foreach (var genericParameterConstraint in unityMethodGenericParameter.Constraints)
                         {
-                            if (genericParameterConstraint.Constraint?.FullName == "System.ValueType") continue;
-                            if (genericParameterConstraint.Constraint?.Resolve()?.IsInterface ?? false) continue;
+                            if (genericParameterConstraint.IsSystemValueType() || genericParameterConstraint.IsInterface())
+                                continue;
+
+                            if (genericParameterConstraint.IsSystemEnum())
+                            {
+                                newParameter.Constraints.Add(new GenericParameterConstraint(imports.Module.Enum().ToTypeDefOrRef()));
+                                continue;
+                            }
 
                             var newType = ResolveTypeInNewAssemblies(context, genericParameterConstraint.Constraint?.ToTypeSignature(),
                                 imports);