Feedback

radekdoulik · radekdoulik · commit d278c46347e4 · 2026-01-06T10:16:03.000+01:00
diff --git a/src/coreclr/vm/classlayoutinfo.cpp b/src/coreclr/vm/classlayoutinfo.cpp
@@ -108,7 +108,7 @@ namespace
 #ifdef FEATURE_64BIT_ALIGNMENT
             if (pNestedType.RequiresAlign8())
             {
-                placementInfo.m_alignment = max(8u, placementInfo.m_alignment);
+                placementInfo.m_alignment = ALIGN_UP(placementInfo.m_alignment, 8);
             }
 #endif // FEATURE_64BIT_ALIGNMENT
         }
diff --git a/src/coreclr/vm/methodtablebuilder.cpp b/src/coreclr/vm/methodtablebuilder.cpp
@@ -8604,7 +8604,7 @@ VOID MethodTableBuilder::HandleAutoLayout(MethodTable ** pByValueClassCache)
 #if defined(FEATURE_64BIT_ALIGNMENT)
                 if (pByValueMT->RequiresAlign8())
                 {
-                    alignmentRequirement = max(8, alignmentRequirement);
+                    alignmentRequirement = ALIGN_UP(alignmentRequirement, 8);
                 }
 #endif // FEATURE_64BIT_ALIGNMENT
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ namespace`
`108`	`108`	`#ifdef FEATURE_64BIT_ALIGNMENT`
`109`	`109`	`if (pNestedType.RequiresAlign8())`
`110`	`110`	`{`
`111`		`- placementInfo.m_alignment = max(8u, placementInfo.m_alignment);`
	`111`	`+ placementInfo.m_alignment = ALIGN_UP(placementInfo.m_alignment, 8);`
`112`	`112`	`}`
`113`	`113`	`#endif // FEATURE_64BIT_ALIGNMENT`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8604,7 +8604,7 @@ VOID MethodTableBuilder::HandleAutoLayout(MethodTable ** pByValueClassCache)`
`8604`	`8604`	`#if defined(FEATURE_64BIT_ALIGNMENT)`
`8605`	`8605`	`if (pByValueMT->RequiresAlign8())`
`8606`	`8606`	`{`
`8607`		`- alignmentRequirement = max(8, alignmentRequirement);`
	`8607`	`+ alignmentRequirement = ALIGN_UP(alignmentRequirement, 8);`
`8608`	`8608`	`}`
`8609`	`8609`	`#endif // FEATURE_64BIT_ALIGNMENT`
`8610`	`8610`