Don't set a field offset for static fields (SamboyCoding#434)

ds5678 · web-flow · commit 7344147569e2 · 2025-03-29T01:35:07.000Z
diff --git a/Cpp2IL.Core/Utils/AsmResolver/AsmResolverAssemblyPopulator.cs b/Cpp2IL.Core/Utils/AsmResolver/AsmResolverAssemblyPopulator.cs
@@ -371,7 +371,7 @@ private static void CopyFieldsInType(ReferenceImporter importer, TypeAnalysisCon
                 if (managedField.HasFieldRva)
                     managedField.FieldRva = new DataSegment(fieldInfo.Field.StaticArrayInitialValue);
 
-                if (ilTypeDefinition.IsExplicitLayout)
+                if (ilTypeDefinition.IsExplicitLayout && !fieldContext.IsStatic)
                     //Copy field offset
                     managedField.FieldOffset = fieldInfo.FieldOffset;
             }

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ private static void CopyFieldsInType(ReferenceImporter importer, TypeAnalysisCon`
`371`	`371`	`if (managedField.HasFieldRva)`
`372`	`372`	`managedField.FieldRva = new DataSegment(fieldInfo.Field.StaticArrayInitialValue);`
`373`	`373`
`374`		`- if (ilTypeDefinition.IsExplicitLayout)`
	`374`	`+ if (ilTypeDefinition.IsExplicitLayout && !fieldContext.IsStatic)`
`375`	`375`	`//Copy field offset`
`376`	`376`	`managedField.FieldOffset = fieldInfo.FieldOffset;`
`377`	`377`	`}`