Fix invalid constructor being generated in unboxed struct variants

limoka · limoka · commit 35d2507ef952 · 2023-06-09T15:30:07.000+03:00
diff --git a/Il2CppInterop.Generator/Passes/Pass50GenerateMethods.cs b/Il2CppInterop.Generator/Passes/Pass50GenerateMethods.cs
@@ -66,7 +66,8 @@ public static void DoPass(RewriteGlobalContext context)
                     if (nextInstruction != null)
                         bodyBuilder.Append(nextInstruction);
 
-                    if (typeContext.ComputedTypeSpecifics != TypeRewriteContext.TypeSpecifics.BlittableStruct)
+                    if (typeContext.ComputedTypeSpecifics != TypeRewriteContext.TypeSpecifics.BlittableStruct &&
+                        typeContext.ComputedTypeSpecifics != TypeRewriteContext.TypeSpecifics.GenericBlittableStruct)
                     {
                         if (originalMethod.IsConstructor)
                         {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,8 @@ public static void DoPass(RewriteGlobalContext context)`
`66`	`66`	`if (nextInstruction != null)`
`67`	`67`	`bodyBuilder.Append(nextInstruction);`
`68`	`68`
`69`		`- if (typeContext.ComputedTypeSpecifics != TypeRewriteContext.TypeSpecifics.BlittableStruct)`
	`69`	`+ if (typeContext.ComputedTypeSpecifics != TypeRewriteContext.TypeSpecifics.BlittableStruct &&`
	`70`	`+ typeContext.ComputedTypeSpecifics != TypeRewriteContext.TypeSpecifics.GenericBlittableStruct)`
`70`	`71`	`{`
`71`	`72`	`if (originalMethod.IsConstructor)`
`72`	`73`	`{`