Merge pull request #57 from BepInEx/fix-layout-unstripping

Ensure Proper Layout for Non-ValueTypes
BepInEx · Dec 11, 2022 · d76d246 · d76d246
2 parents 29a6d92 + 27c3ab9
commit d76d246
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Il2CppInterop.Generator/Passes/Pass79UnstripTypes.cs b/Il2CppInterop.Generator/Passes/Pass79UnstripTypes.cs
@@ -79,6 +79,14 @@ private static void ProcessType(AssemblyRewriteContext processedAssembly, TypeDe
                 clonedType.DeclaringType = enclosingNewType;
             }
 
+            // Unity assemblies sometimes have struct layouts on classes.
+            // This gets overlooked on mono but not on coreclr.
+            if (!clonedType.IsValueType && (clonedType.IsExplicitLayout || clonedType.IsSequentialLayout))
+            {
+                clonedType.IsExplicitLayout = clonedType.IsSequentialLayout = false;
+                clonedType.IsAutoLayout = true;
+            }
+
             processedAssembly.RegisterTypeRewrite(new TypeRewriteContext(processedAssembly, null, clonedType));
             processedType = clonedType;
         }