diff --git a/test/jdk/java/foreign/TestByteBuffer.java b/test/jdk/java/foreign/TestByteBuffer.java index 77b3dd3b105..a77f97018ca 100644 --- a/test/jdk/java/foreign/TestByteBuffer.java +++ b/test/jdk/java/foreign/TestByteBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -171,7 +171,7 @@ public class TestByteBuffer { @Test public void testOffheap() { try (Arena arena = Arena.ofConfined()) { - MemorySegment segment = arena.allocate(tuples);; + MemorySegment segment = arena.allocate(tuples); initTuples(segment, tuples.elementCount()); ByteBuffer bb = segment.asByteBuffer(); @@ -385,7 +385,7 @@ public class TestByteBuffer { public void testScopedBuffer(Function bufferFactory, @NoInjection Method method, Object[] args) { Buffer bb; try (Arena arena = Arena.ofConfined()) { - MemorySegment segment = arena.allocate(bytes);; + MemorySegment segment = arena.allocate(bytes); bb = bufferFactory.apply(segment.asByteBuffer()); } //outside of session!! @@ -411,7 +411,7 @@ public class TestByteBuffer { public void testScopedBufferAndVarHandle(VarHandle bufferHandle) { ByteBuffer bb; try (Arena arena = Arena.ofConfined()) { - MemorySegment segment = arena.allocate(bytes);; + MemorySegment segment = arena.allocate(bytes, Long.BYTES); bb = segment.asByteBuffer(); for (Map.Entry e : varHandleMembers(bb, bufferHandle).entrySet()) { MethodHandle handle = e.getKey().bindTo(bufferHandle) @@ -445,7 +445,7 @@ public class TestByteBuffer { @Test(dataProvider = "bufferOps") public void testDirectBuffer(Function bufferFactory, @NoInjection Method method, Object[] args) { try (Arena arena = Arena.ofConfined()) { - MemorySegment segment = arena.allocate(bytes);; + MemorySegment segment = arena.allocate(bytes); Buffer bb = bufferFactory.apply(segment.asByteBuffer()); assertTrue(bb.isDirect()); DirectBuffer directBuffer = ((DirectBuffer)bb); @@ -458,7 +458,7 @@ public class TestByteBuffer { @Test(dataProvider="resizeOps") public void testResizeOffheap(Consumer checker, Consumer initializer, SequenceLayout seq) { try (Arena arena = Arena.ofConfined()) { - MemorySegment segment = arena.allocate(seq);; + MemorySegment segment = arena.allocate(seq); initializer.accept(segment); checker.accept(segment); } @@ -496,7 +496,7 @@ public class TestByteBuffer { @Test(dataProvider="resizeOps") public void testResizeRoundtripNative(Consumer checker, Consumer initializer, SequenceLayout seq) { try (Arena arena = Arena.ofConfined()) { - MemorySegment segment = arena.allocate(seq);; + MemorySegment segment = arena.allocate(seq); initializer.accept(segment); MemorySegment second = MemorySegment.ofBuffer(segment.asByteBuffer()); checker.accept(second); @@ -507,7 +507,7 @@ public class TestByteBuffer { public void testBufferOnClosedSession() { MemorySegment leaked; try (Arena arena = Arena.ofConfined()) { - leaked = arena.allocate(bytes);; + leaked = arena.allocate(bytes); } ByteBuffer byteBuffer = leaked.asByteBuffer(); // ok byteBuffer.get(); // should throw @@ -615,7 +615,7 @@ public class TestByteBuffer { checkByteArrayAlignment(seq.elementLayout()); int bytes = (int)seq.byteSize(); try (Arena arena = Arena.ofConfined()) { - MemorySegment nativeArray = arena.allocate(bytes, 1);; + MemorySegment nativeArray = arena.allocate(bytes, 1); MemorySegment heapArray = MemorySegment.ofArray(new byte[bytes]); initializer.accept(heapArray); nativeArray.copyFrom(heapArray); @@ -628,7 +628,7 @@ public class TestByteBuffer { checkByteArrayAlignment(seq.elementLayout()); int bytes = (int)seq.byteSize(); try (Arena arena = Arena.ofConfined()) { - MemorySegment nativeArray = arena.allocate(seq);; + MemorySegment nativeArray = arena.allocate(seq); MemorySegment heapArray = MemorySegment.ofArray(new byte[bytes]); initializer.accept(nativeArray); heapArray.copyFrom(nativeArray); @@ -700,7 +700,7 @@ public class TestByteBuffer { @Test public void testRoundTripAccess() { try (Arena arena = Arena.ofConfined()) { - MemorySegment ms = arena.allocate(4, 1);; + MemorySegment ms = arena.allocate(4, 1); MemorySegment msNoAccess = ms.asReadOnly(); MemorySegment msRoundTrip = MemorySegment.ofBuffer(msNoAccess.asByteBuffer()); assertEquals(msRoundTrip.scope(), ms.scope()); @@ -741,7 +741,7 @@ public class TestByteBuffer { tmp.deleteOnExit(); try (FileChannel channel = FileChannel.open(tmp.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE) ; Arena arena = arenaSupplier.get()) { - MemorySegment segment = arena.allocate(10, 1);; + MemorySegment segment = arena.allocate(10, 1); for (int i = 0; i < 10; i++) { segment.set(JAVA_BYTE, i, (byte) i); } @@ -780,7 +780,7 @@ public class TestByteBuffer { @Test public void buffersAndArraysFromSlices() { try (Arena arena = Arena.ofShared()) { - MemorySegment segment = arena.allocate(16, 1);; + MemorySegment segment = arena.allocate(16, 1); int newSize = 8; var slice = segment.asSlice(4, newSize); @@ -798,7 +798,7 @@ public class TestByteBuffer { @Test public void viewsFromSharedSegment() { try (Arena arena = Arena.ofShared()) { - MemorySegment segment = arena.allocate(16, 1);; + MemorySegment segment = arena.allocate(16, 1); var byteBuffer = segment.asByteBuffer(); byteBuffer.asReadOnlyBuffer(); byteBuffer.slice(0, 8); diff --git a/test/jdk/java/foreign/TestDereferencePath.java b/test/jdk/java/foreign/TestDereferencePath.java index 116f2d318fc..e2281cde235 100644 --- a/test/jdk/java/foreign/TestDereferencePath.java +++ b/test/jdk/java/foreign/TestDereferencePath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -173,7 +173,7 @@ public class TestDereferencePath { ValueLayout.ADDRESS.withTargetLayout(ValueLayout.JAVA_INT).withName("x")); try (Arena arena = Arena.ofConfined()) { - MemorySegment segment = arena.allocate(struct.byteSize() + 1).asSlice(1); + MemorySegment segment = arena.allocate(struct.byteSize() + 1, struct.byteAlignment()).asSlice(1); VarHandle vhX = struct.varHandle(PathElement.groupElement("x"), PathElement.dereferenceElement()); vhX.set(segment, 0L, 42); // should throw }