Remove alignment restriction for FieldRVA in Metadata

0xd4d · Aug 6, 2023 · 1727923 · 1727923
1 parent 2c2aea0
commit 1727923
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/DotNet/Writer/Metadata.cs b/src/DotNet/Writer/Metadata.cs
@@ -2706,11 +2706,8 @@ protected void AddFieldRVA(FieldDef field) {
 				uint rid = GetRid(field);
 
 				uint alignment = ModuleWriterBase.DEFAULT_CONSTANTS_ALIGNMENT;
-				const uint MaxFieldInitialValueAlignment = 1024U;
-				if (field.FieldType is TypeDefOrRefSig tdrSig && tdrSig.TypeDef?.ClassLayout is {} classLayout) {
-					uint requiredAlignment = Math.Min(Utils.RoundToNextPowerOfTwo(classLayout.PackingSize), MaxFieldInitialValueAlignment);
-					alignment = Math.Max(alignment, requiredAlignment);
-				}
+				if (field.FieldType is TypeDefOrRefSig tdrSig && tdrSig.TypeDef?.ClassLayout is {} classLayout)
+					alignment = Math.Max(alignment, Utils.RoundToNextPowerOfTwo(classLayout.PackingSize));
 
 				var iv = constants.Add(new ByteArrayChunk(ivBytes, alignment), alignment);
 				fieldToInitialValue[field] = iv;