Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from
+6 −6
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions test/jdk/java/foreign/TestLinker.java
View file
Original file line number Diff line number Diff line change
@@ -181,7 +181,7 @@ public void interwovenPadding() {
var fd = FunctionDescriptor.of(struct, struct, struct);
var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd));
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
@@ -199,7 +199,7 @@ public void stackedPadding() {
var fd = FunctionDescriptor.of(struct, struct, struct);
var e = expectThrows(IllegalArgumentException.class, () -> linker.downcallHandle(fd));
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
@@ -208,7 +208,7 @@ public void paddingUnionByteSize3() {
var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(3), ValueLayout.JAVA_INT);
var fd = FunctionDescriptor.of(union, union, union);
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
@@ -217,7 +217,7 @@ public void paddingUnionByteSize4() {
var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(4), ValueLayout.JAVA_INT);
var fd = FunctionDescriptor.of(union, union, union);
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
@@ -226,7 +226,7 @@ public void paddingUnionByteSize5() {
var union = MemoryLayout.unionLayout(MemoryLayout.paddingLayout(5), ValueLayout.JAVA_INT);
var fd = FunctionDescriptor.of(union, union, union);
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
@@ -239,7 +239,7 @@ public void paddingUnionSeveral() {
MemoryLayout.paddingLayout(16));
var fd = FunctionDescriptor.of(union, union, union);
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