Updating the Vector64, Vector128, and Vector256 StructPacking tests.

diff --git a/src/vm/methodtablebuilder.cpp b/src/vm/methodtablebuilder.cpp
index f309fbc40f089dfcd0e5d04d75715d4f6bd4555a..859d7454700a2c8b9fb6e3589460c7784286fad8 100644 (file)
--- a/src/vm/methodtablebuilder.cpp
+++ b/src/vm/methodtablebuilder.cpp
@@ -9684,6 +9684,9 @@ void MethodTableBuilder::CheckForSystemTypes()
                     pLayout->m_ManagedLargestAlignmentRequirementOfAllMembers = 4;
                     break;
                 }
+
+                default:
+                    break;
             }
 #endif // _TARGET_X86_ && UNIX_X86_ABI
 

diff --git a/tests/src/Interop/StructPacking/StructPacking.cs b/tests/src/Interop/StructPacking/StructPacking.cs
index 8871b9a1b69fa5608695ac8fbb1f60a561e24486..6df179d98a509f3095edcf36f69dccb0e4a45f46 100644 (file)
--- a/tests/src/Interop/StructPacking/StructPacking.cs
+++ b/tests/src/Interop/StructPacking/StructPacking.cs
@@ -1208,17 +1208,48 @@ unsafe class Program
     {
         bool succeeded = true;
 
-        succeeded &= Test<DefaultLayoutDefaultPacking<Vector128<byte>>>(
-            expectedSize: 24,
-            expectedOffsetByte: 0,
-            expectedOffsetValue: 8
-        );
+        if (RuntimeInformation.OSArchitecture == Architecture.Arm)
+        {
+            // The Procedure Call Standard for ARM defines this type as having 8-byte alignment
 
-        succeeded &= Test<SequentialLayoutDefaultPacking<Vector128<byte>>>(
-            expectedSize: 24,
-            expectedOffsetByte: 0,
-            expectedOffsetValue: 8
-        );
+            succeeded &= Test<DefaultLayoutDefaultPacking<Vector128<byte>>>(
+                expectedSize: 24,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 8
+            );
+
+            succeeded &= Test<SequentialLayoutDefaultPacking<Vector128<byte>>>(
+                expectedSize: 24,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 8
+            );
+
+            succeeded &= Test<SequentialLayoutMaxPacking<Vector128<byte>>>(
+                expectedSize: 24,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 8
+            );
+        }
+        else
+        {
+            succeeded &= Test<DefaultLayoutDefaultPacking<Vector128<byte>>>(
+                expectedSize: 32,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 16
+            );
+
+            succeeded &= Test<SequentialLayoutDefaultPacking<Vector128<byte>>>(
+                expectedSize: 32,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 16
+            );
+
+            succeeded &= Test<SequentialLayoutMaxPacking<Vector128<byte>>>(
+                expectedSize: 32,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 16
+            );
+        }
 
         succeeded &= Test<SequentialLayoutMinPacking<Vector128<byte>>>(
             expectedSize: 17,
@@ -1226,12 +1257,6 @@ unsafe class Program
             expectedOffsetValue: 1
         );
 
-        succeeded &= Test<SequentialLayoutMaxPacking<Vector128<byte>>>(
-            expectedSize: 24,
-            expectedOffsetByte: 0,
-            expectedOffsetValue: 8
-        );
-
         if (Environment.Is64BitProcess)
         {
             succeeded &= Test<AutoLayoutDefaultPacking<Vector128<byte>>>(
@@ -1280,17 +1305,70 @@ unsafe class Program
     {
         bool succeeded = true;
 
-        succeeded &= Test<DefaultLayoutDefaultPacking<Vector256<byte>>>(
-            expectedSize: 40,
-            expectedOffsetByte: 0,
-            expectedOffsetValue: 8
-        );
+        if (RuntimeInformation.OSArchitecture == Architecture.Arm)
+        {
+            // The Procedure Call Standard for ARM defines this type as having 8-byte alignment
 
-        succeeded &= Test<SequentialLayoutDefaultPacking<Vector256<byte>>>(
-            expectedSize: 40,
-            expectedOffsetByte: 0,
-            expectedOffsetValue: 8
-        );
+            succeeded &= Test<DefaultLayoutDefaultPacking<Vector256<byte>>>(
+                expectedSize: 40,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 8
+            );
+
+            succeeded &= Test<SequentialLayoutDefaultPacking<Vector256<byte>>>(
+                expectedSize: 40,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 8
+            );
+
+            succeeded &= Test<SequentialLayoutMaxPacking<Vector256<byte>>>(
+                expectedSize: 40,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 8
+            );
+        }
+        else if (RuntimeInformation.OSArchitecture == Architecture.Arm64)
+        {
+            // The Procedure Call Standard for ARM64 defines this type as having 16-byte alignment
+
+            succeeded &= Test<DefaultLayoutDefaultPacking<Vector256<byte>>>(
+                expectedSize: 48,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 16
+            );
+
+            succeeded &= Test<SequentialLayoutDefaultPacking<Vector256<byte>>>(
+                expectedSize: 48,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 16
+            );
+
+            succeeded &= Test<SequentialLayoutMaxPacking<Vector256<byte>>>(
+                expectedSize: 48,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 16
+            );
+        }
+        else
+        {
+            succeeded &= Test<DefaultLayoutDefaultPacking<Vector256<byte>>>(
+                expectedSize: 64,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 32
+            );
+
+            succeeded &= Test<SequentialLayoutDefaultPacking<Vector256<byte>>>(
+                expectedSize: 64,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 32
+            );
+
+            succeeded &= Test<SequentialLayoutMaxPacking<Vector256<byte>>>(
+                expectedSize: 64,
+                expectedOffsetByte: 0,
+                expectedOffsetValue: 32
+            );
+        }
 
         succeeded &= Test<SequentialLayoutMinPacking<Vector256<byte>>>(
             expectedSize: 33,
@@ -1298,12 +1376,6 @@ unsafe class Program
             expectedOffsetValue: 1
         );
 
-        succeeded &= Test<SequentialLayoutMaxPacking<Vector256<byte>>>(
-            expectedSize: 40,
-            expectedOffsetByte: 0,
-            expectedOffsetValue: 8
-        );
-
         if (Environment.Is64BitProcess)
         {
             succeeded &= Test<AutoLayoutDefaultPacking<Vector256<byte>>>(