From defc7e0f8d32e2dc62568f34d86d8f77a759e6ce Mon Sep 17 00:00:00 2001 From: Per Minborg Date: Thu, 19 Oct 2023 10:47:53 +0000 Subject: [PATCH] 8318454: TestLayoutPaths broken on Big Endian platforms after JDK-8317837 Reviewed-by: mdoerr, mcimadamore --- test/jdk/java/foreign/TestLayoutPaths.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/jdk/java/foreign/TestLayoutPaths.java b/test/jdk/java/foreign/TestLayoutPaths.java index c3692b1fb9d..f04814f5849 100644 --- a/test/jdk/java/foreign/TestLayoutPaths.java +++ b/test/jdk/java/foreign/TestLayoutPaths.java @@ -42,7 +42,6 @@ import java.util.function.IntFunction; import static java.lang.foreign.MemoryLayout.PathElement.groupElement; import static java.lang.foreign.MemoryLayout.PathElement.sequenceElement; import static java.lang.foreign.ValueLayout.JAVA_INT; -import static java.lang.foreign.ValueLayout.JAVA_LONG; import static java.lang.foreign.ValueLayout.JAVA_SHORT; import static org.testng.Assert.*; @@ -139,8 +138,8 @@ public class TestLayoutPaths { @Test public void testBadAlignmentOfRoot() { MemoryLayout struct = MemoryLayout.structLayout( - JAVA_INT, - JAVA_SHORT.withName("x")); + JAVA_INT.withOrder(ByteOrder.LITTLE_ENDIAN), + JAVA_SHORT.withOrder(ByteOrder.LITTLE_ENDIAN).withName("x")); assertEquals(struct.byteAlignment(), 4); try (Arena arena = Arena.ofConfined()) {