Fix subtle difference in x86 alignment with vs. without layout

dotnet · Jun 3, 2021 · 642659b · 642659b
1 parent cabf41c
commit 642659b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs b/src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs
@@ -840,13 +840,13 @@ private static SizeAndAlignment ComputeFieldSizeAndAlignment(TypeDesc fieldType,
                 result.Alignment = fieldType.Context.Target.LayoutPointerSize;
             }
 
-            if (!hasLayout || fieldType.Context.Target.Architecture != TargetArchitecture.ARM)
+            if (hasLayout)
             {
                 result.Alignment = LayoutInt.Min(result.Alignment, new LayoutInt(packingSize));
             }
-            else if (packingSize < 8)
+            else
             {
-                result.Alignment = LayoutInt.Min(result.Alignment, fieldType.Context.Target.LayoutPointerSize);
+                result.Alignment = LayoutInt.Min(result.Alignment, fieldType.Context.Target.GetObjectAlignment(result.Alignment));
             }
 
             return result;