stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8344954: Linker tests fails on BE platforms after JDK-8340205

Browse Source 
Reviewed-by: mdoerr, amitkumar
This commit is contained in:
Per Minborg 2024-11-26 08:24:21 +00:00
parent ca81ab5ebc
commit 4e68d665be
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/jdk/java/foreign/TestLinker.java
View File

@ -181,7 +181,7 @@ public class TestLinker extends NativeTestHelper {
var fd = FunctionDescriptor.of(struct, struct, struct); var fd = FunctionDescriptor.of(struct, struct, struct);
var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd)); var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd));
assertEquals(e.getMessage(), assertEquals(e.getMessage(),
"The padding layout x2 was preceded by another padding layout x1 in [b1x1x2i4]"); "The padding layout x2 was preceded by another padding layout x1 in " + struct);
} }
@Test @Test
@ -199,7 +199,7 @@ public class TestLinker extends NativeTestHelper {
var fd = FunctionDescriptor.of(struct, struct, struct); var fd = FunctionDescriptor.of(struct, struct, struct);
var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd)); var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd));
assertEquals(e.getMessage(), assertEquals(e.getMessage(),
"The padding layout x2 was preceded by another padding layout x1 in [b1x1x2x4x8x16[[[4:j8]]|x32]]"); "The padding layout x2 was preceded by another padding layout x1 in " + struct);
} }
@Test @Test
@ -208,7 +208,7 @@ public class TestLinker extends NativeTestHelper {
var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(3), ValueLayout.JAVA_INT); var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(3), ValueLayout.JAVA_INT);
var fd = FunctionDescriptor.of(union, union, union); var fd = FunctionDescriptor.of(union, union, union);
var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd)); var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd));
assertEquals(e.getMessage(), "Superfluous padding x3 in [x3|i4]"); assertEquals(e.getMessage(), "Superfluous padding x3 in " + union);
} }
@Test @Test
@ -217,7 +217,7 @@ public class TestLinker extends NativeTestHelper {
var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(4), ValueLayout.JAVA_INT); var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(4), ValueLayout.JAVA_INT);
var fd = FunctionDescriptor.of(union, union, union); var fd = FunctionDescriptor.of(union, union, union);
var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd)); var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd));
assertEquals(e.getMessage(), "Superfluous padding x4 in [x4|i4]"); assertEquals(e.getMessage(), "Superfluous padding x4 in " + union);
} }
@Test @Test
@ -226,7 +226,7 @@ public class TestLinker extends NativeTestHelper {
var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(5), ValueLayout.JAVA_INT); var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(5), ValueLayout.JAVA_INT);
var fd = FunctionDescriptor.of(union, union, union); var fd = FunctionDescriptor.of(union, union, union);
var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd)); var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd));
assertEquals(e.getMessage(), "Layout '[x5|i4]' has unexpected size: 5 != 4"); assertEquals(e.getMessage(), "Layout '" + union + "' has unexpected size: 5 != 4");
} }
@Test @Test
@ -239,7 +239,7 @@ public class TestLinker extends NativeTestHelper {
MemoryLayout.paddingLayout(16)); MemoryLayout.paddingLayout(16));
var fd = FunctionDescriptor.of(union, union, union); var fd = FunctionDescriptor.of(union, union, union);
var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd)); var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd));
assertEquals(e.getMessage(), "More than one padding in [[3:i4]|j8|x16|x16]"); assertEquals(e.getMessage(), "More than one padding in " + union);
} }
@Test @Test