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

8299561: VaList.empty() doesn't return a list associated with the global scope

Browse Source 
Reviewed-by: jvernee
This commit is contained in:
Maurizio Cimadamore 2023-01-05 09:44:16 +00:00
parent a17f505d73
commit 9c4ed16be2
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/linux/LinuxAArch64VaList.java
View File

@ -129,7 +129,7 @@ public non-sealed class LinuxAArch64VaList implements VaList {
}
private static MemorySegment emptyListAddress() {
MemorySegment ms = MemorySegment.allocateNative(LAYOUT, SegmentScope.auto());
MemorySegment ms = MemorySegment.allocateNative(LAYOUT, SegmentScope.global());
VH_stack.set(ms, MemorySegment.NULL);
VH_gr_top.set(ms, MemorySegment.NULL);
VH_vr_top.set(ms, MemorySegment.NULL);

2
src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVVaList.java
View File

@ -138,7 +138,7 @@ public non-sealed class SysVVaList implements VaList {
}
private static MemorySegment emptyListAddress() {
MemorySegment base = MemorySegment.allocateNative(LAYOUT, SegmentScope.auto());
MemorySegment base = MemorySegment.allocateNative(LAYOUT, SegmentScope.global());
VH_gp_offset.set(base, MAX_GP_OFFSET);
VH_fp_offset.set(base, MAX_FP_OFFSET);
VH_overflow_arg_area.set(base, MemorySegment.NULL);

4
test/jdk/java/foreign/valist/VaListTest.java
View File

@ -907,4 +907,8 @@ public class VaListTest extends NativeTestHelper {
assertThrows(NoSuchElementException.class, () -> nextVarg(vaList, next));
}
@Test(dataProvider = "emptyVaLists")
public void testEmptyVaListScope(VaList vaList) {
assertEquals(vaList.segment().scope(), SegmentScope.global());
}
}