From a365849e986dab7d5faf32c1716abec61a8c63a0 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Tue, 7 May 2024 16:30:29 +0100 Subject: [PATCH 01/19] Initial push --- .../jdk/internal/foreign/LayoutPath.java | 9 ++++++++- test/jdk/java/foreign/TestAccessModes.java | 10 +++++----- .../java/lang/foreign/LoopOverNonConstant.java | 17 +++++++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java index 390ad1b2f97da..a64b3809afcbb 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java +++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java @@ -26,6 +26,7 @@ package jdk.internal.foreign; import jdk.internal.vm.annotation.ForceInline; +import sun.security.action.GetPropertyAction; import java.lang.foreign.AddressLayout; import java.lang.foreign.GroupLayout; @@ -68,6 +69,9 @@ public class LayoutPath { private static final MethodHandle MH_SEGMENT_RESIZE; private static final MethodHandle MH_ADD; + private static final boolean USE_FULL_CHECKS = Boolean.parseBoolean( + GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.handle.USE_FULL_CHECKS", "false")); + static { try { MethodHandles.Lookup lookup = MethodHandles.lookup(); @@ -205,7 +209,10 @@ public VarHandle dereferenceHandle(boolean adapt) { String.format("Path does not select a value layout: %s", breadcrumbs())); } - VarHandle handle = valueLayout.varHandle(); + // If we have an enclosing layout, drop the alignment check for the accessed element, + // we check the root layout instead + ValueLayout accessedLayout = (enclosing != null && !USE_FULL_CHECKS) ? valueLayout.withByteAlignment(1) : valueLayout; + VarHandle handle = accessedLayout.varHandle(); handle = MethodHandles.collectCoordinates(handle, 1, offsetHandle()); // we only have to check the alignment of the root layout for the first dereference we do, diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java index 89662c95252ce..b6908f682f227 100644 --- a/test/jdk/java/foreign/TestAccessModes.java +++ b/test/jdk/java/foreign/TestAccessModes.java @@ -23,10 +23,10 @@ /* * @test - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes + * @run testng/othervm -Djdk.internal.foreign.handle.USE_FULL_CHECKS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes + * @run testng/othervm -Djdk.internal.foreign.handle.USE_FULL_CHECKS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes + * @run testng/othervm -Djdk.internal.foreign.handle.USE_FULL_CHECKS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes + * @run testng/othervm -Djdk.internal.foreign.handle.USE_FULL_CHECKS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes */ import java.lang.foreign.*; @@ -150,7 +150,7 @@ static MemoryLayout[] layouts() { }; List layouts = new ArrayList<>(); for (MemoryLayout layout : valueLayouts) { - for (int align : new int[] { 1, 2, 4, 8 }) { + for (int align : new int[] { 2 }) { layouts.add(layout.withByteAlignment(align)); layouts.add(MemoryLayout.structLayout(layout.withByteAlignment(align))); } diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java index 91ce8faec3854..56a9c02fb6a4b 100644 --- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java +++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java @@ -142,6 +142,23 @@ public int segment_loop_unaligned() { return sum; } + public int segment_loop_nested() { + int sum = 0; + for (int i = 0; i < ELEM_SIZE; i++) { + sum += (int) VH_SEQ_INT.get(segment, (long) i); + } + return sum; + } + + @Benchmark + public int segment_loop_nested_unaligned() { + int sum = 0; + for (int i = 0; i < ELEM_SIZE; i++) { + sum += (int) VH_SEQ_INT_UNALIGNED.get(segment, (long) i); + } + return sum; + } + @Benchmark public int segment_loop_nested() { int sum = 0; From f3d274041f3c3433045938a6735e5d8accffbf13 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Tue, 7 May 2024 16:46:16 +0100 Subject: [PATCH 02/19] Drop JDK property --- .../share/classes/jdk/internal/foreign/LayoutPath.java | 9 +-------- test/jdk/java/foreign/TestAccessModes.java | 8 ++++---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java index a64b3809afcbb..390ad1b2f97da 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java +++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java @@ -26,7 +26,6 @@ package jdk.internal.foreign; import jdk.internal.vm.annotation.ForceInline; -import sun.security.action.GetPropertyAction; import java.lang.foreign.AddressLayout; import java.lang.foreign.GroupLayout; @@ -69,9 +68,6 @@ public class LayoutPath { private static final MethodHandle MH_SEGMENT_RESIZE; private static final MethodHandle MH_ADD; - private static final boolean USE_FULL_CHECKS = Boolean.parseBoolean( - GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.handle.USE_FULL_CHECKS", "false")); - static { try { MethodHandles.Lookup lookup = MethodHandles.lookup(); @@ -209,10 +205,7 @@ public VarHandle dereferenceHandle(boolean adapt) { String.format("Path does not select a value layout: %s", breadcrumbs())); } - // If we have an enclosing layout, drop the alignment check for the accessed element, - // we check the root layout instead - ValueLayout accessedLayout = (enclosing != null && !USE_FULL_CHECKS) ? valueLayout.withByteAlignment(1) : valueLayout; - VarHandle handle = accessedLayout.varHandle(); + VarHandle handle = valueLayout.varHandle(); handle = MethodHandles.collectCoordinates(handle, 1, offsetHandle()); // we only have to check the alignment of the root layout for the first dereference we do, diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java index b6908f682f227..3942fe3ca0ccd 100644 --- a/test/jdk/java/foreign/TestAccessModes.java +++ b/test/jdk/java/foreign/TestAccessModes.java @@ -23,10 +23,10 @@ /* * @test - * @run testng/othervm -Djdk.internal.foreign.handle.USE_FULL_CHECKS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes - * @run testng/othervm -Djdk.internal.foreign.handle.USE_FULL_CHECKS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes - * @run testng/othervm -Djdk.internal.foreign.handle.USE_FULL_CHECKS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes - * @run testng/othervm -Djdk.internal.foreign.handle.USE_FULL_CHECKS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes + * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes + * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes + * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes + * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes */ import java.lang.foreign.*; From fb58019be08b234474cd4606fb1b8f86b63d083e Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 8 May 2024 16:32:12 +0100 Subject: [PATCH 03/19] Revert spurious change to test --- test/jdk/java/foreign/TestAccessModes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java index 3942fe3ca0ccd..89662c95252ce 100644 --- a/test/jdk/java/foreign/TestAccessModes.java +++ b/test/jdk/java/foreign/TestAccessModes.java @@ -150,7 +150,7 @@ static MemoryLayout[] layouts() { }; List layouts = new ArrayList<>(); for (MemoryLayout layout : valueLayouts) { - for (int align : new int[] { 2 }) { + for (int align : new int[] { 1, 2, 4, 8 }) { layouts.add(layout.withByteAlignment(align)); layouts.add(MemoryLayout.structLayout(layout.withByteAlignment(align))); } From 79760fb830254979e5d2e3b3d3797017e9644a29 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 8 May 2024 17:33:44 +0100 Subject: [PATCH 04/19] Add benchmark anno --- .../org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java index 56a9c02fb6a4b..9bff6e02210a7 100644 --- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java +++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java @@ -142,6 +142,7 @@ public int segment_loop_unaligned() { return sum; } + @Benchmark public int segment_loop_nested() { int sum = 0; for (int i = 0; i < ELEM_SIZE; i++) { From 59fb99c252617293f0c0996b8bf711d797969259 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 8 May 2024 17:33:04 +0100 Subject: [PATCH 05/19] Add size check for root layout --- .../java/lang/foreign/MemoryLayout.java | 22 ++++++++++--------- .../jdk/internal/foreign/LayoutPath.java | 15 +++++++------ test/jdk/java/foreign/TestHeapAlignment.java | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java index 123c5897f26e5..008fdd8d2cc77 100644 --- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java +++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java @@ -625,10 +625,11 @@ public sealed interface MemoryLayout * (this layout), or an {@link IllegalArgumentException} is thrown. Note * that the alignment constraint of the root layout can be more strict * (but not less) than the alignment constraint of the selected value layout. - *
  • The offset of the access operation (computed as above) must fall inside - * the spatial bounds of the accessed memory segment, or an - * {@link IndexOutOfBoundsException} is thrown. This is the case when - * {@code O + A <= S}, where {@code O} is the accessed offset (computed as above), + *
  • The size of the accessed memory segment (taking into account the base offset {@code B}), + * must be equal or greater than the {@linkplain #byteSize() size} of the root layout + * (this layout), or an {@link IndexOutOfBoundsException} is thrown. Note that, as the selected value + * layout is nested inside the root layout, this also implies that {@code O + A <= S}, + * where {@code O} is the accessed offset (computed as above), * {@code A} is the size of the selected layout and {@code S} is the size of the * accessed memory segment.
    • *
  • If the provided layout path has an open path element whose size is {@code S}, @@ -822,12 +823,13 @@ public sealed interface MemoryLayout * (this layout), or an {@link IllegalArgumentException} will be issued. Note * that the alignment constraint of the root layout can be more strict * (but not less) than the alignment constraint of the selected layout.
    • - *
  • The start offset of the slicing operation (computed as above) must fall - * inside the spatial bounds of the accessed memory segment, or an - * {@link IndexOutOfBoundsException} is thrown. This is the case when - * {@code O + A <= S}, where {@code O} is the start offset of - * the slicing operation (computed as above), {@code A} is the size of the - * selected layout and {@code S} is the size of the accessed memory segment.
    • + *
  • The size of the accessed memory segment (taking into account the base offset {@code B}), + * must be equal or greater than the {@linkplain #byteSize() size} of the root layout + * (this layout), or an {@link IndexOutOfBoundsException} is thrown. Note that, as the selected value + * layout is nested inside the root layout, this also implies that {@code O + A <= S}, + * where {@code O} is the start offset of the slicing operation (computed as above), + * {@code A} is the size of the selected layout and {@code S} is the size of the + * accessed memory segment.
    • *
  • If the provided layout path has an open path element whose size is {@code S}, * its corresponding trailing {@code long} coordinate value {@code I} must be * {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.
    • diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java index 390ad1b2f97da..adeab46595b36 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java +++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java @@ -64,7 +64,7 @@ public class LayoutPath { private static final MethodHandle MH_ADD_SCALED_OFFSET; private static final MethodHandle MH_SLICE; private static final MethodHandle MH_SLICE_LAYOUT; - private static final MethodHandle MH_CHECK_ALIGN; + private static final MethodHandle MH_CHECK_ENCL_LAYOUT; private static final MethodHandle MH_SEGMENT_RESIZE; private static final MethodHandle MH_ADD; @@ -77,7 +77,7 @@ public class LayoutPath { MethodType.methodType(MemorySegment.class, long.class, long.class)); MH_SLICE_LAYOUT = lookup.findVirtual(MemorySegment.class, "asSlice", MethodType.methodType(MemorySegment.class, long.class, MemoryLayout.class)); - MH_CHECK_ALIGN = lookup.findStatic(LayoutPath.class, "checkAlign", + MH_CHECK_ENCL_LAYOUT = lookup.findStatic(LayoutPath.class, "checkEnclosingLayout", MethodType.methodType(void.class, MemorySegment.class, long.class, MemoryLayout.class)); MH_SEGMENT_RESIZE = lookup.findStatic(LayoutPath.class, "resizeSegment", MethodType.methodType(MemorySegment.class, MemorySegment.class, MemoryLayout.class)); @@ -214,7 +214,7 @@ public VarHandle dereferenceHandle(boolean adapt) { if (derefAdapters.length == 0 && enclosing != null) { // insert align check for the root layout on the initial MS + offset List> coordinateTypes = handle.coordinateTypes(); - MethodHandle alignCheck = MethodHandles.insertArguments(MH_CHECK_ALIGN, 2, rootLayout()); + MethodHandle alignCheck = MethodHandles.insertArguments(MH_CHECK_ENCL_LAYOUT, 2, rootLayout()); handle = MethodHandles.collectCoordinates(handle, 0, alignCheck); int[] reorder = IntStream.concat(IntStream.of(0, 1), IntStream.range(0, coordinateTypes.size())).toArray(); handle = MethodHandles.permuteCoordinates(handle, coordinateTypes, reorder); @@ -275,7 +275,7 @@ public MethodHandle sliceHandle() { if (enclosing != null) { // insert align check for the root layout on the initial MS + offset MethodType oldType = sliceHandle.type(); - MethodHandle alignCheck = MethodHandles.insertArguments(MH_CHECK_ALIGN, 2, rootLayout()); + MethodHandle alignCheck = MethodHandles.insertArguments(MH_CHECK_ENCL_LAYOUT, 2, rootLayout()); sliceHandle = MethodHandles.collectArguments(sliceHandle, 0, alignCheck); // (MS, long, MS, long) -> MS int[] reorder = IntStream.concat(IntStream.of(0, 1), IntStream.range(0, oldType.parameterCount())).toArray(); sliceHandle = MethodHandles.permuteArguments(sliceHandle, oldType, reorder); // (MS, long, ...) -> MS @@ -284,12 +284,13 @@ public MethodHandle sliceHandle() { return sliceHandle; } - private static void checkAlign(MemorySegment segment, long offset, MemoryLayout constraint) { - if (!((AbstractMemorySegmentImpl) segment).isAlignedForElement(offset, constraint)) { + private static void checkEnclosingLayout(MemorySegment segment, long offset, MemoryLayout enclosing) { + if (!((AbstractMemorySegmentImpl) segment).isAlignedForElement(offset, enclosing)) { throw new IllegalArgumentException(String.format( "Target offset %d is incompatible with alignment constraint %d (of %s) for segment %s" - , offset, constraint.byteAlignment(), constraint, segment)); + , offset, enclosing.byteAlignment(), enclosing, segment)); } + ((AbstractMemorySegmentImpl)segment).checkAccess(offset, enclosing.byteSize(), true); } public MemoryLayout layout() { diff --git a/test/jdk/java/foreign/TestHeapAlignment.java b/test/jdk/java/foreign/TestHeapAlignment.java index 99f09611914c1..f43ec188c54ae 100644 --- a/test/jdk/java/foreign/TestHeapAlignment.java +++ b/test/jdk/java/foreign/TestHeapAlignment.java @@ -45,7 +45,7 @@ public class TestHeapAlignment { public void testHeapAlignment(MemorySegment segment, int align, Object val, Object arr, ValueLayout layout, Function segmentFactory) { assertAligned(align, layout, () -> layout.varHandle().get(segment, 0L)); assertAligned(align, layout, () -> layout.varHandle().set(segment, 0L, val)); - MemoryLayout seq = MemoryLayout.sequenceLayout(10, layout); + MemoryLayout seq = MemoryLayout.sequenceLayout(1, layout); assertAligned(align, layout, () -> seq.varHandle(MemoryLayout.PathElement.sequenceElement()).get(segment, 0L, 0L)); assertAligned(align, layout, () -> seq.varHandle(MemoryLayout.PathElement.sequenceElement()).set(segment, 0L, 0L, val)); assertAligned(align, layout, () -> segment.spliterator(layout)); From 326ad8925d51afdf3d6d3dfa1891404bbfb05875 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 8 May 2024 18:08:00 +0100 Subject: [PATCH 06/19] Tweak javadoc --- .../java/lang/foreign/MemoryLayout.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java index 008fdd8d2cc77..e4acd7d6bc30f 100644 --- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java +++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java @@ -627,9 +627,11 @@ public sealed interface MemoryLayout * (but not less) than the alignment constraint of the selected value layout. *
  • The size of the accessed memory segment (taking into account the base offset {@code B}), * must be equal or greater than the {@linkplain #byteSize() size} of the root layout - * (this layout), or an {@link IndexOutOfBoundsException} is thrown. Note that, as the selected value - * layout is nested inside the root layout, this also implies that {@code O + A <= S}, - * where {@code O} is the accessed offset (computed as above), + * (this layout), or an {@link IndexOutOfBoundsException} is thrown. + *
  • The offset of the access operation (computed as above) must fall inside + * the spatial bounds of the accessed memory segment, or an + * {@link IndexOutOfBoundsException} is thrown. This is the case when + * {@code O + A <= S}, where {@code O} is the accessed offset (computed as above), * {@code A} is the size of the selected layout and {@code S} is the size of the * accessed memory segment.
    • *
  • If the provided layout path has an open path element whose size is {@code S}, @@ -825,11 +827,13 @@ public sealed interface MemoryLayout * (but not less) than the alignment constraint of the selected layout.
    • *
  • The size of the accessed memory segment (taking into account the base offset {@code B}), * must be equal or greater than the {@linkplain #byteSize() size} of the root layout - * (this layout), or an {@link IndexOutOfBoundsException} is thrown. Note that, as the selected value - * layout is nested inside the root layout, this also implies that {@code O + A <= S}, - * where {@code O} is the start offset of the slicing operation (computed as above), - * {@code A} is the size of the selected layout and {@code S} is the size of the - * accessed memory segment.
    • + * (this layout), or an {@link IndexOutOfBoundsException} is thrown. + *
  • The start offset of the slicing operation (computed as above) must fall + * inside the spatial bounds of the accessed memory segment, or an + * {@link IndexOutOfBoundsException} is thrown. This is the case when + * {@code O + A <= S}, where {@code O} is the start offset of + * the slicing operation (computed as above), {@code A} is the size of the + * selected layout and {@code S} is the size of the accessed memory segment.
    • *
  • If the provided layout path has an open path element whose size is {@code S}, * its corresponding trailing {@code long} coordinate value {@code I} must be * {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.
    • From 49e51f817592051cf768f65e80b2b88745374432 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Fri, 10 May 2024 17:06:45 +0100 Subject: [PATCH 07/19] Improve implementation efficiency --- .../java/lang/invoke/MethodHandleImpl.java | 4 +- .../lang/invoke/VarHandleSegmentViewBase.java | 6 +- .../classes/java/lang/invoke/VarHandles.java | 16 +- .../X-VarHandleSegmentView.java.template | 189 +++++++++--------- .../internal/access/JavaLangInvokeAccess.java | 2 +- .../foreign/AbstractMemorySegmentImpl.java | 7 +- .../jdk/internal/foreign/LayoutPath.java | 4 +- .../classes/jdk/internal/foreign/Utils.java | 30 +-- .../internal/foreign/layout/ValueLayouts.java | 9 +- 9 files changed, 135 insertions(+), 132 deletions(-) diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java index e79c8463d30b2..994e4aaf2b2aa 100644 --- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java @@ -1569,8 +1569,8 @@ public Map generateHolderClasses(Stream traces) { } @Override - public VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, ByteOrder order) { - return VarHandles.memorySegmentViewHandle(carrier, alignmentMask, order); + public VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, ByteOrder order, boolean nested) { + return VarHandles.memorySegmentViewHandle(carrier, alignmentMask, order, nested); } @Override diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java index 5cb71cf042456..0385fb3cc5adb 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java @@ -48,11 +48,15 @@ abstract sealed class VarHandleSegmentViewBase extends VarHandle permits /** alignment constraint (in bytes, expressed as a bit mask) **/ final long alignmentMask; - VarHandleSegmentViewBase(VarForm form, boolean be, long length, long alignmentMask, boolean exact) { + /** is this var handle accessing a value layout nested inside another layout? **/ + final boolean nested; + + VarHandleSegmentViewBase(VarForm form, boolean be, long length, long alignmentMask, boolean nested, boolean exact) { super(form, exact); this.be = be; this.length = length; this.alignmentMask = alignmentMask; + this.nested = nested; } static IllegalArgumentException newIllegalArgumentExceptionForMisalignedAccess(long address) { diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java index 0a3932004476f..8553cf1519342 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandles.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandles.java @@ -312,7 +312,7 @@ else if (viewComponentType == float.class) { * @return the created VarHandle. */ static VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, - ByteOrder byteOrder) { + ByteOrder byteOrder, boolean nested) { if (!carrier.isPrimitive() || carrier == void.class || carrier == boolean.class) { throw new IllegalArgumentException("Invalid carrier: " + carrier.getName()); } @@ -321,19 +321,19 @@ static VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, boolean exact = VAR_HANDLE_SEGMENT_FORCE_EXACT; if (carrier == byte.class) { - return maybeAdapt(new VarHandleSegmentAsBytes(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsBytes(be, size, alignmentMask, nested, exact)); } else if (carrier == char.class) { - return maybeAdapt(new VarHandleSegmentAsChars(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsChars(be, size, alignmentMask, nested, exact)); } else if (carrier == short.class) { - return maybeAdapt(new VarHandleSegmentAsShorts(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsShorts(be, size, alignmentMask, nested, exact)); } else if (carrier == int.class) { - return maybeAdapt(new VarHandleSegmentAsInts(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsInts(be, size, alignmentMask, nested, exact)); } else if (carrier == float.class) { - return maybeAdapt(new VarHandleSegmentAsFloats(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsFloats(be, size, alignmentMask, nested, exact)); } else if (carrier == long.class) { - return maybeAdapt(new VarHandleSegmentAsLongs(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsLongs(be, size, alignmentMask, nested, exact)); } else if (carrier == double.class) { - return maybeAdapt(new VarHandleSegmentAsDoubles(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsDoubles(be, size, alignmentMask, nested, exact)); } else { throw new IllegalStateException("Cannot get here"); } diff --git a/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template index aa1c232e5df38..428a647d3bf7d 100644 --- a/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template +++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template @@ -47,8 +47,8 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { static final VarForm FORM = new VarForm(VarHandleSegmentAs$Type$s.class, MemorySegment.class, $type$.class, long.class); - VarHandleSegmentAs$Type$s(boolean be, long length, long alignmentMask, boolean exact) { - super(FORM, be, length, alignmentMask, exact); + VarHandleSegmentAs$Type$s(boolean be, long length, long alignmentMask, boolean nested, boolean exact) { + super(FORM, be, length, alignmentMask, nested, exact); } @Override @@ -60,14 +60,14 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { public VarHandleSegmentAs$Type$s withInvokeExactBehavior() { return hasInvokeExactBehavior() ? this : - new VarHandleSegmentAs$Type$s(be, length, alignmentMask, true); + new VarHandleSegmentAs$Type$s(be, length, alignmentMask, nested, true); } @Override public VarHandleSegmentAs$Type$s withInvokeBehavior() { return !hasInvokeExactBehavior() ? this : - new VarHandleSegmentAs$Type$s(be, length, alignmentMask, false); + new VarHandleSegmentAs$Type$s(be, length, alignmentMask, nested, false); } #if[floatingPoint] @@ -97,50 +97,57 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { #end[floatingPoint] @ForceInline - static AbstractMemorySegmentImpl checkAddress(Object obb, long offset, long length, boolean ro) { + static AbstractMemorySegmentImpl checkAddress(Object obb, long offset, long length, boolean ro, boolean nested) { AbstractMemorySegmentImpl oo = (AbstractMemorySegmentImpl)Objects.requireNonNull(obb); - oo.checkAccess(offset, length, ro); + if (nested) { + // bounds check occurs outside + oo.checkReadOnly(ro); + } else { + oo.checkAccess(offset, length, ro); + } return oo; } @ForceInline - static long offsetNonPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask) { + static long offsetNonPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask, boolean nested) { if ((alignmentMask & NON_PLAIN_ACCESS_MIN_ALIGN_MASK) != NON_PLAIN_ACCESS_MIN_ALIGN_MASK) { throw VarHandleSegmentViewBase.newUnsupportedAccessModeForAlignment(alignmentMask + 1); } - return offsetPlain(bb, offset, alignmentMask); + return offsetPlain(bb, offset, alignmentMask, nested); } @ForceInline - static long offsetPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask) { + static long offsetPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask, boolean nested) { long base = bb.unsafeGetOffset(); long address = base + offset; - long maxAlignMask = bb.maxAlignMask(); - if (((address | maxAlignMask) & alignmentMask) != 0) { - throw VarHandleSegmentViewBase.newIllegalArgumentExceptionForMisalignedAccess(address); - } + if (!nested) { + long maxAlignMask = bb.maxAlignMask(); + if (((address | maxAlignMask) & alignmentMask) != 0) { + throw VarHandleSegmentViewBase.newIllegalArgumentExceptionForMisalignedAccess(address); + } + } // otherwise, bounds check occurs outside return address; } @ForceInline static $type$ get(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true, handle.nested); #if[floatingPoint] $rawType$ rawValue = SCOPED_MEMORY_ACCESS.get$RawType$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base, handle.alignmentMask, handle.nested), handle.be); return $Type$.$rawType$BitsTo$Type$(rawValue); #else[floatingPoint] #if[byte] return SCOPED_MEMORY_ACCESS.get$Type$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask)); + offsetPlain(bb, base, handle.alignmentMask, handle.nested)); #else[byte] return SCOPED_MEMORY_ACCESS.get$Type$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base, handle.alignmentMask, handle.nested), handle.be); #end[byte] #end[floatingPoint] @@ -149,23 +156,23 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static void set(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); #if[floatingPoint] SCOPED_MEMORY_ACCESS.put$RawType$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base, handle.alignmentMask, handle.nested), $Type$.$type$ToRaw$RawType$Bits(value), handle.be); #else[floatingPoint] #if[byte] SCOPED_MEMORY_ACCESS.put$Type$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base, handle.alignmentMask, handle.nested), value); #else[byte] SCOPED_MEMORY_ACCESS.put$Type$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base, handle.alignmentMask, handle.nested), value, handle.be); #end[byte] @@ -175,60 +182,60 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getVolatile(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Volatile(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask))); + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested))); } @ForceInline static void setVolatile(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); SCOPED_MEMORY_ACCESS.put$RawType$Volatile(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, value)); } @ForceInline static $type$ getAcquire(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask))); + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested))); } @ForceInline static void setRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); SCOPED_MEMORY_ACCESS.put$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, value)); } @ForceInline static $type$ getOpaque(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Opaque(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask))); + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested))); } @ForceInline static void setOpaque(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); SCOPED_MEMORY_ACCESS.put$RawType$Opaque(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, value)); } #if[CAS] @@ -236,116 +243,116 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static boolean compareAndSet(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return SCOPED_MEMORY_ACCESS.compareAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static $type$ compareAndExchange(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, expected), convEndian(handle.be, value))); } @ForceInline static $type$ compareAndExchangeAcquire(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, expected), convEndian(handle.be, value))); } @ForceInline static $type$ compareAndExchangeRelease(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, expected), convEndian(handle.be, value))); } @ForceInline static boolean weakCompareAndSetPlain(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Plain(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static boolean weakCompareAndSet(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static boolean weakCompareAndSetAcquire(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static boolean weakCompareAndSetRelease(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static $type$ getAndSet(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, value))); } @ForceInline static $type$ getAndSetAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, value))); } @ForceInline static $type$ getAndSetRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), convEndian(handle.be, value))); } #end[CAS] @@ -354,42 +361,42 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndAdd(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); } else { - return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), delta); + return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); } } @ForceInline static $type$ getAndAddAcquire(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); } else { - return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), delta); + return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); } } @ForceInline static $type$ getAndAddRelease(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); } else { - return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), delta); + return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); } } @@ -410,42 +417,42 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseOr(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } @ForceInline static $type$ getAndBitwiseOrRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } @ForceInline static $type$ getAndBitwiseOrAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } @@ -464,42 +471,42 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseAnd(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } @ForceInline static $type$ getAndBitwiseAndRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } @ForceInline static $type$ getAndBitwiseAndAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } @@ -519,42 +526,42 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseXor(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } @ForceInline static $type$ getAndBitwiseXorRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } @ForceInline static $type$ getAndBitwiseXorAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask), + offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } else { - return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); + return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); } } diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java index 563870381febf..a11480d5787f3 100644 --- a/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java +++ b/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java @@ -75,7 +75,7 @@ public interface JavaLangInvokeAccess { * Used by {@code jdk.internal.foreign.LayoutPath} and * {@code java.lang.invoke.MethodHandles}. */ - VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, ByteOrder order); + VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, ByteOrder order, boolean nested); /** * Var handle carrier combinator. diff --git a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java index 05e7f345b266e..8ce42dd139e81 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java +++ b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java @@ -357,10 +357,15 @@ private Z toArray(Class arrayClass, ValueLayout elemLayout, IntFunction HANDLE_MAP = new ConcurrentHashMap<>(); - - static VarHandle put(ValueLayout layout, VarHandle handle) { - VarHandle prev = HANDLE_MAP.putIfAbsent(layout, handle); - return prev != null ? prev : handle; - } - - static VarHandle get(ValueLayout layout) { - return HANDLE_MAP.get(layout); - } - } - layout = layout.withoutName(); // name doesn't matter - // keep the addressee layout as it's used below - - VarHandle handle = VarHandleCache.get(layout); - if (handle != null) { - return handle; - } - + public static VarHandle makeSegmentViewVarHandle(ValueLayout layout, boolean nested) { Class baseCarrier = layout.carrier(); if (layout.carrier() == MemorySegment.class) { baseCarrier = switch ((int) ValueLayout.ADDRESS.byteSize()) { @@ -121,8 +99,8 @@ static VarHandle get(ValueLayout layout) { baseCarrier = byte.class; } - handle = SharedSecrets.getJavaLangInvokeAccess().memorySegmentViewHandle(baseCarrier, - layout.byteAlignment() - 1, layout.order()); + VarHandle handle = SharedSecrets.getJavaLangInvokeAccess().memorySegmentViewHandle(baseCarrier, + layout.byteAlignment() - 1, layout.order(), nested); if (layout.carrier() == boolean.class) { handle = MethodHandles.filterValue(handle, BOOL_TO_BYTE, BYTE_TO_BOOL); @@ -133,7 +111,7 @@ static VarHandle get(ValueLayout layout) { pointeeByteSize(addressLayout), pointeeByteAlign(addressLayout)), MethodType.methodType(MemorySegment.class, baseCarrier))); } - return VarHandleCache.put(layout, handle); + return handle; } public static boolean byteToBoolean(byte b) { diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java index 4b41c80f2ebd9..275c6c0eccfdf 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java +++ b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java @@ -38,8 +38,11 @@ import java.lang.foreign.ValueLayout; import java.lang.invoke.VarHandle; import java.nio.ByteOrder; +import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; /** * A value layout. A value layout is used to model the memory layout associated with values of basic data types, such as integral types @@ -157,9 +160,13 @@ static boolean isValidCarrier(Class carrier) { @ForceInline public final VarHandle varHandle() { + final class VarHandleCache { + private static final Map HANDLE_MAP = new ConcurrentHashMap<>(); + } if (handle == null) { // this store to stable field is safe, because return value of 'makeMemoryAccessVarHandle' has stable identity - handle = Utils.makeSegmentViewVarHandle(self()); + handle = VarHandleCache.HANDLE_MAP + .computeIfAbsent(withoutName(), l -> Utils.makeSegmentViewVarHandle(l, false)); } return handle; } From d56a83220e2bd0c62a47579ac8b56734fcc7ea2d Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Fri, 10 May 2024 19:06:00 +0100 Subject: [PATCH 08/19] Cache both nested and toplevel var handles --- .../classes/jdk/internal/foreign/Utils.java | 20 +++++++++++++++++++ .../internal/foreign/layout/ValueLayouts.java | 6 +----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/java.base/share/classes/jdk/internal/foreign/Utils.java b/src/java.base/share/classes/jdk/internal/foreign/Utils.java index fb321fbc61240..d5fe693d311ff 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/Utils.java +++ b/src/java.base/share/classes/jdk/internal/foreign/Utils.java @@ -37,6 +37,8 @@ import java.lang.invoke.VarHandle; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; import jdk.internal.access.SharedSecrets; @@ -88,6 +90,24 @@ public static MemorySegment alignUp(MemorySegment ms, long alignment) { } public static VarHandle makeSegmentViewVarHandle(ValueLayout layout, boolean nested) { + final class VarHandleCache { + private static final Map HANDLE_MAP_TOPLEVEL = new ConcurrentHashMap<>(); + private static final Map HANDLE_MAP_NESTED = new ConcurrentHashMap<>(); + } + return nested ? + VarHandleCache.HANDLE_MAP_NESTED.computeIfAbsent(layout.withoutName(), Utils::makeNestedSegmentViewVarHandle) : + VarHandleCache.HANDLE_MAP_TOPLEVEL.computeIfAbsent(layout.withoutName(), Utils::makeToplevelSegmentViewVarHandle); + } + + private static VarHandle makeToplevelSegmentViewVarHandle(ValueLayout layout) { + return makeSegmentViewVarHandleInternal(layout, false); + } + + private static VarHandle makeNestedSegmentViewVarHandle(ValueLayout layout) { + return makeSegmentViewVarHandleInternal(layout, true); + } + + private static VarHandle makeSegmentViewVarHandleInternal(ValueLayout layout, boolean nested) { Class baseCarrier = layout.carrier(); if (layout.carrier() == MemorySegment.class) { baseCarrier = switch ((int) ValueLayout.ADDRESS.byteSize()) { diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java index 275c6c0eccfdf..1098c2e9a8e4e 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java +++ b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java @@ -160,13 +160,9 @@ static boolean isValidCarrier(Class carrier) { @ForceInline public final VarHandle varHandle() { - final class VarHandleCache { - private static final Map HANDLE_MAP = new ConcurrentHashMap<>(); - } if (handle == null) { // this store to stable field is safe, because return value of 'makeMemoryAccessVarHandle' has stable identity - handle = VarHandleCache.HANDLE_MAP - .computeIfAbsent(withoutName(), l -> Utils.makeSegmentViewVarHandle(l, false)); + handle = Utils.makeSegmentViewVarHandle((ValueLayout) this, false); } return handle; } From 3e0ffe99c3e34f1e957e32340dfe6e50ab0512de Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 15 May 2024 16:22:36 +0100 Subject: [PATCH 09/19] Fix benchmark --- .../java/lang/foreign/LoopOverNonConstant.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java index 9bff6e02210a7..91ce8faec3854 100644 --- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java +++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverNonConstant.java @@ -160,24 +160,6 @@ public int segment_loop_nested_unaligned() { return sum; } - @Benchmark - public int segment_loop_nested() { - int sum = 0; - for (int i = 0; i < ELEM_SIZE; i++) { - sum += (int) VH_SEQ_INT.get(segment, (long) i); - } - return sum; - } - - @Benchmark - public int segment_loop_nested_unaligned() { - int sum = 0; - for (int i = 0; i < ELEM_SIZE; i++) { - sum += (int) VH_SEQ_INT_UNALIGNED.get(segment, (long) i); - } - return sum; - } - @Benchmark public int segment_loop_instance() { int sum = 0; From 70010e34c15cca8ffa26dec2ccbacdd0bf366c72 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 15 May 2024 16:38:21 +0100 Subject: [PATCH 10/19] cleanup javadoc --- .../java/lang/foreign/MemoryLayout.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java index e4acd7d6bc30f..7087ec94a7bac 100644 --- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java +++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java @@ -625,9 +625,12 @@ public sealed interface MemoryLayout * (this layout), or an {@link IllegalArgumentException} is thrown. Note * that the alignment constraint of the root layout can be more strict * (but not less) than the alignment constraint of the selected value layout. - *
  • The size of the accessed memory segment (taking into account the base offset {@code B}), - * must be equal or greater than the {@linkplain #byteSize() size} of the root layout - * (this layout), or an {@link IndexOutOfBoundsException} is thrown. + *
  • The access operation must fall inside the spatial bounds of the accessed + * memory segment, or an {@link IndexOutOfBoundsException} is thrown. This is the case + * when {@code B + A <= S}, where {@code O} is the base offset (defined above), + * {@code A} is the size of this layout and {@code S} is the size of the + * accessed memory segment. Note that the size of this layout might be bigger + * than the size of the accessed layout (e.g. when accessing a struct member).
    • *
  • The offset of the access operation (computed as above) must fall inside * the spatial bounds of the accessed memory segment, or an * {@link IndexOutOfBoundsException} is thrown. This is the case when @@ -756,12 +759,12 @@ public sealed interface MemoryLayout * (this layout), or an {@link IllegalArgumentException} is thrown. Note * that the alignment constraint of the root layout can be more strict * (but not less) than the alignment constraint of the selected value layout.
    • - *
  • The offset of the access operation (computed as above) must fall inside - * the spatial bounds of the accessed memory segment, or an - * {@link IndexOutOfBoundsException} is thrown. This is the case when - * {@code O + A <= S}, where {@code O} is the accessed offset (computed as above), - * {@code A} is the size of the selected layout and {@code S} is the size of the - * accessed memory segment.
    • + *
  • The access operation must fall inside the spatial bounds of the accessed + * memory segment, or an {@link IndexOutOfBoundsException} is thrown. This is the case + * when {@code B + A <= S}, where {@code O} is the base offset (defined above), + * {@code A} is the size of this layout and {@code S} is the size of the + * accessed memory segment. Note that the size of this layout might be bigger + * than the size of the accessed layout (e.g. when accessing a struct member).
    • *
  • If the provided layout path has an open path element whose size is {@code S}, * its corresponding trailing {@code long} coordinate value {@code I} must be * {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.
    • @@ -825,15 +828,12 @@ public sealed interface MemoryLayout * (this layout), or an {@link IllegalArgumentException} will be issued. Note * that the alignment constraint of the root layout can be more strict * (but not less) than the alignment constraint of the selected layout. - *
  • The size of the accessed memory segment (taking into account the base offset {@code B}), - * must be equal or greater than the {@linkplain #byteSize() size} of the root layout - * (this layout), or an {@link IndexOutOfBoundsException} is thrown. - *
  • The start offset of the slicing operation (computed as above) must fall - * inside the spatial bounds of the accessed memory segment, or an - * {@link IndexOutOfBoundsException} is thrown. This is the case when - * {@code O + A <= S}, where {@code O} is the start offset of - * the slicing operation (computed as above), {@code A} is the size of the - * selected layout and {@code S} is the size of the accessed memory segment.
    • + *
  • The slicing operation must fall inside the spatial bounds of the accessed + * memory segment, or an {@link IndexOutOfBoundsException} is thrown. This is the case + * when {@code B + A <= S}, where {@code O} is the base offset (defined above), + * {@code A} is the size of this layout and {@code S} is the size of the + * accessed memory segment. Note that the size of this layout might be bigger + * than the size of the accessed layout (e.g. when accessing a struct member).
    • *
  • If the provided layout path has an open path element whose size is {@code S}, * its corresponding trailing {@code long} coordinate value {@code I} must be * {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.
    • From 749a6caff23f2eaf3f331846ffc8b2a4d7c9ddd9 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 15 May 2024 16:46:46 +0100 Subject: [PATCH 11/19] Drop spurious changes --- .../share/classes/java/lang/foreign/MemoryLayout.java | 6 ------ .../classes/jdk/internal/foreign/layout/ValueLayouts.java | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java index 7087ec94a7bac..fab37c85f47c1 100644 --- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java +++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java @@ -631,12 +631,6 @@ public sealed interface MemoryLayout * {@code A} is the size of this layout and {@code S} is the size of the * accessed memory segment. Note that the size of this layout might be bigger * than the size of the accessed layout (e.g. when accessing a struct member). - *
  • The offset of the access operation (computed as above) must fall inside - * the spatial bounds of the accessed memory segment, or an - * {@link IndexOutOfBoundsException} is thrown. This is the case when - * {@code O + A <= S}, where {@code O} is the accessed offset (computed as above), - * {@code A} is the size of the selected layout and {@code S} is the size of the - * accessed memory segment.
    • *
  • If the provided layout path has an open path element whose size is {@code S}, * its corresponding trailing {@code long} coordinate value {@code I} must be * {@code 0 <= I < S}, or an {@link IndexOutOfBoundsException} is thrown.
    • diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java index 1098c2e9a8e4e..672a4edcf40f7 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java +++ b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java @@ -38,11 +38,8 @@ import java.lang.foreign.ValueLayout; import java.lang.invoke.VarHandle; import java.nio.ByteOrder; -import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Function; /** * A value layout. A value layout is used to model the memory layout associated with values of basic data types, such as integral types @@ -162,7 +159,7 @@ static boolean isValidCarrier(Class carrier) { public final VarHandle varHandle() { if (handle == null) { // this store to stable field is safe, because return value of 'makeMemoryAccessVarHandle' has stable identity - handle = Utils.makeSegmentViewVarHandle((ValueLayout) this, false); + handle = Utils.makeSegmentViewVarHandle(self(), false); } return handle; } From cae116dda71d649ea201e3e88b5dd06d3c0066b8 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 15 May 2024 16:56:56 +0100 Subject: [PATCH 12/19] Add tests for nested layout size check --- test/jdk/java/foreign/TestLayoutPaths.java | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/test/jdk/java/foreign/TestLayoutPaths.java b/test/jdk/java/foreign/TestLayoutPaths.java index 484e8f86ab5f9..414eb4117ced7 100644 --- a/test/jdk/java/foreign/TestLayoutPaths.java +++ b/test/jdk/java/foreign/TestLayoutPaths.java @@ -34,6 +34,7 @@ import java.lang.invoke.MethodHandle; import java.lang.invoke.VarHandle; +import java.lang.invoke.VarHandle.AccessMode; import java.nio.ByteOrder; import java.util.ArrayList; import java.util.Arrays; @@ -331,6 +332,57 @@ public void testOffsetHandleOOBIndex(MemoryLayout layout, PathElement[] pathElem } } + @Test(dataProvider = "testLayouts") + public void testVarHandleBadSegment(MemoryLayout layout, PathElement[] pathElements, long[] indexes, + long expectedByteOffset) throws Throwable { + MemoryLayout seqLayout = MemoryLayout.sequenceLayout(10, layout); + PathElement[] seqPathElements = new PathElement[pathElements.length + 1]; + long[] seqIndexes = new long[indexes.length + 1]; + System.arraycopy(pathElements, 0, seqPathElements, 1, pathElements.length); + System.arraycopy(indexes, 0, seqIndexes, 1, indexes.length); + seqPathElements[0] = PathElement.sequenceElement(); + seqIndexes[0] = 0; + MethodHandle getter_handle = seqLayout.varHandle(seqPathElements) + .toMethodHandle(AccessMode.GET) + .asSpreader(long[].class, seqIndexes.length); + MemorySegment segment = Arena.ofAuto().allocate(layout); + assertThrows(IndexOutOfBoundsException.class, () -> getter_handle.invoke(segment, 0L, seqIndexes)); + } + + @Test(dataProvider = "testLayouts") + public void testSliceHandleBadSegment(MemoryLayout layout, PathElement[] pathElements, long[] indexes, + long expectedByteOffset) throws Throwable { + MemoryLayout seqLayout = MemoryLayout.sequenceLayout(10, layout); + PathElement[] seqPathElements = new PathElement[pathElements.length + 1]; + long[] seqIndexes = new long[indexes.length + 1]; + System.arraycopy(pathElements, 0, seqPathElements, 1, pathElements.length); + System.arraycopy(indexes, 0, seqIndexes, 1, indexes.length); + seqPathElements[0] = PathElement.sequenceElement(); + seqIndexes[0] = 0; + MethodHandle getter_handle = seqLayout.sliceHandle(seqPathElements) + .asSpreader(long[].class, seqIndexes.length); + MemorySegment segment = Arena.ofAuto().allocate(layout); + assertThrows(IndexOutOfBoundsException.class, () -> getter_handle.invoke(segment, 0L, seqIndexes)); + } + + @Test(dataProvider = "testLayouts") + public void testArrayElementVarHandleBadSegment(MemoryLayout layout, PathElement[] pathElements, long[] indexes, + long expectedByteOffset) throws Throwable { + MemoryLayout seqLayout = MemoryLayout.sequenceLayout(10, layout); + PathElement[] seqPathElements = new PathElement[pathElements.length + 1]; + long[] seqIndexes = new long[indexes.length + 2]; + System.arraycopy(pathElements, 0, seqPathElements, 1, pathElements.length); + System.arraycopy(indexes, 0, seqIndexes, 2, indexes.length); + seqPathElements[0] = PathElement.sequenceElement(); + seqIndexes[0] = 0; + seqIndexes[1] = 0; + MethodHandle getter_handle = seqLayout.arrayElementVarHandle(seqPathElements) + .toMethodHandle(AccessMode.GET) + .asSpreader(long[].class, seqIndexes.length); + MemorySegment segment = Arena.ofAuto().allocate(layout); + assertThrows(IndexOutOfBoundsException.class, () -> getter_handle.invoke(segment, 0L, seqIndexes)); + } + @Test public void testHashCodeCollision() { PathElement sequenceElement = PathElement.sequenceElement(); From 0903397d47ee7a21d49cf250538e827ee72c1e04 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 15 May 2024 18:50:07 +0100 Subject: [PATCH 13/19] Only use nested var handles TODO: use extra MH coordinate to inject check inside VH code --- .../foreign/AbstractMemorySegmentImpl.java | 2 + .../jdk/internal/foreign/LayoutPath.java | 6 +-- .../classes/jdk/internal/foreign/Utils.java | 8 +--- .../foreign/layout/AbstractLayout.java | 4 ++ .../internal/foreign/layout/ValueLayouts.java | 8 +++- test/jdk/java/foreign/TestAccessModes.java | 38 +++++++++---------- 6 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java index 8ce42dd139e81..f9f6ac2022a2b 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java +++ b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java @@ -828,6 +828,7 @@ public MemorySegment get(AddressLayout layout, long offset) { @ForceInline @Override public void set(AddressLayout layout, long offset, MemorySegment value) { + Objects.requireNonNull(value); layout.varHandle().set((MemorySegment)this, offset, value); } @@ -953,6 +954,7 @@ public MemorySegment getAtIndex(AddressLayout layout, long index) { @ForceInline @Override public void setAtIndex(AddressLayout layout, long index, MemorySegment value) { + Objects.requireNonNull(value); Utils.checkElementAlignment(layout, "Layout alignment greater than its size"); layout.varHandle().set((MemorySegment)this, index * layout.byteSize(), value); } diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java index e3f60fe680f48..0fb41bf720849 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java +++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java @@ -207,13 +207,13 @@ public VarHandle dereferenceHandle(boolean adapt) { String.format("Path does not select a value layout: %s", breadcrumbs())); } - VarHandle handle = Utils.makeSegmentViewVarHandle(valueLayout, enclosing != null); + VarHandle handle = Utils.makeSegmentViewVarHandle(valueLayout, true); handle = MethodHandles.collectCoordinates(handle, 1, offsetHandle()); // we only have to check the alignment of the root layout for the first dereference we do, // as each dereference checks the alignment of the target address when constructing its segment // (see Utils::longToAddress) - if (derefAdapters.length == 0 && enclosing != null) { + if (derefAdapters.length == 0) { // insert align check for the root layout on the initial MS + offset List> coordinateTypes = handle.coordinateTypes(); MethodHandle alignCheck = MethodHandles.insertArguments(MH_CHECK_ENCL_LAYOUT, 2, rootLayout()); @@ -287,12 +287,12 @@ public MethodHandle sliceHandle() { } private static void checkEnclosingLayout(MemorySegment segment, long offset, MemoryLayout enclosing) { + ((AbstractMemorySegmentImpl)segment).checkAccess(offset, enclosing.byteSize(), true); if (!((AbstractMemorySegmentImpl) segment).isAlignedForElement(offset, enclosing)) { throw new IllegalArgumentException(String.format( "Target offset %d is incompatible with alignment constraint %d (of %s) for segment %s" , offset, enclosing.byteAlignment(), enclosing, segment)); } - ((AbstractMemorySegmentImpl)segment).checkAccess(offset, enclosing.byteSize(), true); } public MemoryLayout layout() { diff --git a/src/java.base/share/classes/jdk/internal/foreign/Utils.java b/src/java.base/share/classes/jdk/internal/foreign/Utils.java index d5fe693d311ff..7c1afc3957799 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/Utils.java +++ b/src/java.base/share/classes/jdk/internal/foreign/Utils.java @@ -90,13 +90,7 @@ public static MemorySegment alignUp(MemorySegment ms, long alignment) { } public static VarHandle makeSegmentViewVarHandle(ValueLayout layout, boolean nested) { - final class VarHandleCache { - private static final Map HANDLE_MAP_TOPLEVEL = new ConcurrentHashMap<>(); - private static final Map HANDLE_MAP_NESTED = new ConcurrentHashMap<>(); - } - return nested ? - VarHandleCache.HANDLE_MAP_NESTED.computeIfAbsent(layout.withoutName(), Utils::makeNestedSegmentViewVarHandle) : - VarHandleCache.HANDLE_MAP_TOPLEVEL.computeIfAbsent(layout.withoutName(), Utils::makeToplevelSegmentViewVarHandle); + return makeNestedSegmentViewVarHandle(layout); } private static VarHandle makeToplevelSegmentViewVarHandle(ValueLayout layout) { diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/AbstractLayout.java b/src/java.base/share/classes/jdk/internal/foreign/layout/AbstractLayout.java index f72009cf690af..796f0027158f1 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/layout/AbstractLayout.java +++ b/src/java.base/share/classes/jdk/internal/foreign/layout/AbstractLayout.java @@ -188,6 +188,10 @@ public VarHandle varHandle(PathElement... elements) { if (this instanceof ValueLayout vl && elements.length == 0) { return vl.varHandle(); // fast path } + return varHandleInternal(elements); + } + + public VarHandle varHandleInternal(PathElement... elements) { return computePathOp(LayoutPath.rootPath((MemoryLayout) this), LayoutPath::dereferenceHandle, Set.of(), elements); } diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java index 672a4edcf40f7..dfc866346da66 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java +++ b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java @@ -34,12 +34,15 @@ import java.lang.foreign.AddressLayout; import java.lang.foreign.MemoryLayout; +import java.lang.foreign.MemoryLayout.PathElement; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; import java.lang.invoke.VarHandle; import java.nio.ByteOrder; +import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; /** * A value layout. A value layout is used to model the memory layout associated with values of basic data types, such as integral types @@ -157,9 +160,12 @@ static boolean isValidCarrier(Class carrier) { @ForceInline public final VarHandle varHandle() { + final class VarHandleCache { + private static final Map HANDLE_MAP = new ConcurrentHashMap<>(); + } if (handle == null) { // this store to stable field is safe, because return value of 'makeMemoryAccessVarHandle' has stable identity - handle = Utils.makeSegmentViewVarHandle(self(), false); + handle = VarHandleCache.HANDLE_MAP.computeIfAbsent(self().withoutName(), _ -> varHandleInternal()); } return handle; } diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java index 89662c95252ce..54a999a8c6c7d 100644 --- a/test/jdk/java/foreign/TestAccessModes.java +++ b/test/jdk/java/foreign/TestAccessModes.java @@ -24,9 +24,6 @@ /* * @test * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes */ import java.lang.foreign.*; @@ -58,9 +55,8 @@ public void testAccessModes(MemorySegment segment, MemoryLayout layout, AccessMo } catch (UnsupportedOperationException ex) { assertFalse(compatible); } catch (IllegalArgumentException ex) { - // access is unaligned, but access mode is supported - assertTrue(compatible || - (layout instanceof GroupLayout && segment.maxByteAlignment() < layout.byteAlignment())); + // access is unaligned + assertTrue(segment.maxByteAlignment() < layout.byteAlignment()); } } @@ -138,15 +134,15 @@ static Set supportedModes(ValueLayout layout) { static MemoryLayout[] layouts() { MemoryLayout[] valueLayouts = { - ValueLayout.JAVA_BOOLEAN, - ValueLayout.JAVA_CHAR, - ValueLayout.JAVA_BYTE, - ValueLayout.JAVA_SHORT, - ValueLayout.JAVA_INT, - ValueLayout.JAVA_FLOAT, +// ValueLayout.JAVA_BOOLEAN, +// ValueLayout.JAVA_CHAR, +// ValueLayout.JAVA_BYTE, +// ValueLayout.JAVA_SHORT, +// ValueLayout.JAVA_INT, +// ValueLayout.JAVA_FLOAT, ValueLayout.JAVA_LONG, - ValueLayout.JAVA_DOUBLE, - ValueLayout.ADDRESS +// ValueLayout.JAVA_DOUBLE, +// ValueLayout.ADDRESS }; List layouts = new ArrayList<>(); for (MemoryLayout layout : valueLayouts) { @@ -160,14 +156,14 @@ static MemoryLayout[] layouts() { static MemorySegment[] segments() { return new MemorySegment[]{ - Arena.ofAuto().allocate(8), +// Arena.ofAuto().allocate(8), MemorySegment.ofArray(new byte[8]), - MemorySegment.ofArray(new char[4]), - MemorySegment.ofArray(new short[4]), - MemorySegment.ofArray(new int[2]), - MemorySegment.ofArray(new float[2]), - MemorySegment.ofArray(new long[1]), - MemorySegment.ofArray(new double[1]) +// MemorySegment.ofArray(new char[4]), +// MemorySegment.ofArray(new short[4]), +// MemorySegment.ofArray(new int[2]), +// MemorySegment.ofArray(new float[2]), +// MemorySegment.ofArray(new long[1]), +// MemorySegment.ofArray(new double[1]) }; } From c3291cfa2e483513b9b0dcf4e83f7898aef9a7ad Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Wed, 15 May 2024 19:01:21 +0100 Subject: [PATCH 14/19] Cleanup spurious changes --- .../java/lang/invoke/MethodHandleImpl.java | 4 +- .../lang/invoke/VarHandleSegmentViewBase.java | 6 +- .../classes/java/lang/invoke/VarHandles.java | 16 +- .../X-VarHandleSegmentView.java.template | 190 ++++++++---------- .../internal/access/JavaLangInvokeAccess.java | 2 +- .../jdk/internal/foreign/LayoutPath.java | 2 +- .../classes/jdk/internal/foreign/Utils.java | 16 +- 7 files changed, 104 insertions(+), 132 deletions(-) diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java index 994e4aaf2b2aa..e79c8463d30b2 100644 --- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java @@ -1569,8 +1569,8 @@ public Map generateHolderClasses(Stream traces) { } @Override - public VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, ByteOrder order, boolean nested) { - return VarHandles.memorySegmentViewHandle(carrier, alignmentMask, order, nested); + public VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, ByteOrder order) { + return VarHandles.memorySegmentViewHandle(carrier, alignmentMask, order); } @Override diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java index 0385fb3cc5adb..5cb71cf042456 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java @@ -48,15 +48,11 @@ abstract sealed class VarHandleSegmentViewBase extends VarHandle permits /** alignment constraint (in bytes, expressed as a bit mask) **/ final long alignmentMask; - /** is this var handle accessing a value layout nested inside another layout? **/ - final boolean nested; - - VarHandleSegmentViewBase(VarForm form, boolean be, long length, long alignmentMask, boolean nested, boolean exact) { + VarHandleSegmentViewBase(VarForm form, boolean be, long length, long alignmentMask, boolean exact) { super(form, exact); this.be = be; this.length = length; this.alignmentMask = alignmentMask; - this.nested = nested; } static IllegalArgumentException newIllegalArgumentExceptionForMisalignedAccess(long address) { diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java index 8553cf1519342..0a3932004476f 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandles.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandles.java @@ -312,7 +312,7 @@ else if (viewComponentType == float.class) { * @return the created VarHandle. */ static VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, - ByteOrder byteOrder, boolean nested) { + ByteOrder byteOrder) { if (!carrier.isPrimitive() || carrier == void.class || carrier == boolean.class) { throw new IllegalArgumentException("Invalid carrier: " + carrier.getName()); } @@ -321,19 +321,19 @@ static VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, boolean exact = VAR_HANDLE_SEGMENT_FORCE_EXACT; if (carrier == byte.class) { - return maybeAdapt(new VarHandleSegmentAsBytes(be, size, alignmentMask, nested, exact)); + return maybeAdapt(new VarHandleSegmentAsBytes(be, size, alignmentMask, exact)); } else if (carrier == char.class) { - return maybeAdapt(new VarHandleSegmentAsChars(be, size, alignmentMask, nested, exact)); + return maybeAdapt(new VarHandleSegmentAsChars(be, size, alignmentMask, exact)); } else if (carrier == short.class) { - return maybeAdapt(new VarHandleSegmentAsShorts(be, size, alignmentMask, nested, exact)); + return maybeAdapt(new VarHandleSegmentAsShorts(be, size, alignmentMask, exact)); } else if (carrier == int.class) { - return maybeAdapt(new VarHandleSegmentAsInts(be, size, alignmentMask, nested, exact)); + return maybeAdapt(new VarHandleSegmentAsInts(be, size, alignmentMask, exact)); } else if (carrier == float.class) { - return maybeAdapt(new VarHandleSegmentAsFloats(be, size, alignmentMask, nested, exact)); + return maybeAdapt(new VarHandleSegmentAsFloats(be, size, alignmentMask, exact)); } else if (carrier == long.class) { - return maybeAdapt(new VarHandleSegmentAsLongs(be, size, alignmentMask, nested, exact)); + return maybeAdapt(new VarHandleSegmentAsLongs(be, size, alignmentMask, exact)); } else if (carrier == double.class) { - return maybeAdapt(new VarHandleSegmentAsDoubles(be, size, alignmentMask, nested, exact)); + return maybeAdapt(new VarHandleSegmentAsDoubles(be, size, alignmentMask, exact)); } else { throw new IllegalStateException("Cannot get here"); } diff --git a/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template index 428a647d3bf7d..a4901a571af5f 100644 --- a/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template +++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template @@ -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 @@ -47,8 +47,8 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { static final VarForm FORM = new VarForm(VarHandleSegmentAs$Type$s.class, MemorySegment.class, $type$.class, long.class); - VarHandleSegmentAs$Type$s(boolean be, long length, long alignmentMask, boolean nested, boolean exact) { - super(FORM, be, length, alignmentMask, nested, exact); + VarHandleSegmentAs$Type$s(boolean be, long length, long alignmentMask, boolean exact) { + super(FORM, be, length, alignmentMask, exact); } @Override @@ -60,14 +60,14 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { public VarHandleSegmentAs$Type$s withInvokeExactBehavior() { return hasInvokeExactBehavior() ? this : - new VarHandleSegmentAs$Type$s(be, length, alignmentMask, nested, true); + new VarHandleSegmentAs$Type$s(be, length, alignmentMask, true); } @Override public VarHandleSegmentAs$Type$s withInvokeBehavior() { return !hasInvokeExactBehavior() ? this : - new VarHandleSegmentAs$Type$s(be, length, alignmentMask, nested, false); + new VarHandleSegmentAs$Type$s(be, length, alignmentMask, false); } #if[floatingPoint] @@ -97,57 +97,45 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { #end[floatingPoint] @ForceInline - static AbstractMemorySegmentImpl checkAddress(Object obb, long offset, long length, boolean ro, boolean nested) { + static AbstractMemorySegmentImpl checkAddress(Object obb, long offset, long length, boolean ro) { AbstractMemorySegmentImpl oo = (AbstractMemorySegmentImpl)Objects.requireNonNull(obb); - if (nested) { - // bounds check occurs outside - oo.checkReadOnly(ro); - } else { - oo.checkAccess(offset, length, ro); - } + oo.checkReadOnly(ro); return oo; } @ForceInline - static long offsetNonPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask, boolean nested) { + static long offsetNonPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask) { if ((alignmentMask & NON_PLAIN_ACCESS_MIN_ALIGN_MASK) != NON_PLAIN_ACCESS_MIN_ALIGN_MASK) { throw VarHandleSegmentViewBase.newUnsupportedAccessModeForAlignment(alignmentMask + 1); } - return offsetPlain(bb, offset, alignmentMask, nested); + return offsetPlain(bb, offset, alignmentMask); } @ForceInline - static long offsetPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask, boolean nested) { + static long offsetPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask) { long base = bb.unsafeGetOffset(); - long address = base + offset; - if (!nested) { - long maxAlignMask = bb.maxAlignMask(); - if (((address | maxAlignMask) & alignmentMask) != 0) { - throw VarHandleSegmentViewBase.newIllegalArgumentExceptionForMisalignedAccess(address); - } - } // otherwise, bounds check occurs outside - return address; + return base + offset; } @ForceInline static $type$ get(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); #if[floatingPoint] $rawType$ rawValue = SCOPED_MEMORY_ACCESS.get$RawType$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask, handle.nested), + offsetPlain(bb, base, handle.alignmentMask), handle.be); return $Type$.$rawType$BitsTo$Type$(rawValue); #else[floatingPoint] #if[byte] return SCOPED_MEMORY_ACCESS.get$Type$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask, handle.nested)); + offsetPlain(bb, base, handle.alignmentMask)); #else[byte] return SCOPED_MEMORY_ACCESS.get$Type$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask, handle.nested), + offsetPlain(bb, base, handle.alignmentMask), handle.be); #end[byte] #end[floatingPoint] @@ -156,23 +144,23 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static void set(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); #if[floatingPoint] SCOPED_MEMORY_ACCESS.put$RawType$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask, handle.nested), + offsetPlain(bb, base, handle.alignmentMask), $Type$.$type$ToRaw$RawType$Bits(value), handle.be); #else[floatingPoint] #if[byte] SCOPED_MEMORY_ACCESS.put$Type$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask, handle.nested), + offsetPlain(bb, base, handle.alignmentMask), value); #else[byte] SCOPED_MEMORY_ACCESS.put$Type$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask, handle.nested), + offsetPlain(bb, base, handle.alignmentMask), value, handle.be); #end[byte] @@ -182,60 +170,60 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getVolatile(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Volatile(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested))); + offsetNonPlain(bb, base, handle.alignmentMask))); } @ForceInline static void setVolatile(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); SCOPED_MEMORY_ACCESS.put$RawType$Volatile(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, value)); } @ForceInline static $type$ getAcquire(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested))); + offsetNonPlain(bb, base, handle.alignmentMask))); } @ForceInline static void setRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); SCOPED_MEMORY_ACCESS.put$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, value)); } @ForceInline static $type$ getOpaque(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Opaque(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested))); + offsetNonPlain(bb, base, handle.alignmentMask))); } @ForceInline static void setOpaque(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); SCOPED_MEMORY_ACCESS.put$RawType$Opaque(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, value)); } #if[CAS] @@ -243,116 +231,116 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static boolean compareAndSet(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return SCOPED_MEMORY_ACCESS.compareAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static $type$ compareAndExchange(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, expected), convEndian(handle.be, value))); } @ForceInline static $type$ compareAndExchangeAcquire(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, expected), convEndian(handle.be, value))); } @ForceInline static $type$ compareAndExchangeRelease(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, expected), convEndian(handle.be, value))); } @ForceInline static boolean weakCompareAndSetPlain(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Plain(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static boolean weakCompareAndSet(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static boolean weakCompareAndSetAcquire(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static boolean weakCompareAndSetRelease(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, expected), convEndian(handle.be, value)); } @ForceInline static $type$ getAndSet(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, value))); } @ForceInline static $type$ getAndSetAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, value))); } @ForceInline static $type$ getAndSetRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), convEndian(handle.be, value))); } #end[CAS] @@ -361,42 +349,42 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndAdd(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), delta); } else { - return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); + return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), delta); } } @ForceInline static $type$ getAndAddAcquire(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), delta); } else { - return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); + return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), delta); } } @ForceInline static $type$ getAndAddRelease(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), delta); } else { - return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), delta); + return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), delta); } } @@ -417,42 +405,42 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseOr(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } @ForceInline static $type$ getAndBitwiseOrRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } @ForceInline static $type$ getAndBitwiseOrAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } @@ -471,42 +459,42 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseAnd(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } @ForceInline static $type$ getAndBitwiseAndRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } @ForceInline static $type$ getAndBitwiseAndAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } @@ -526,42 +514,42 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseXor(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } @ForceInline static $type$ getAndBitwiseXorRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } @ForceInline static $type$ getAndBitwiseXorAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false, handle.nested); + AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), - offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), + offsetNonPlain(bb, base, handle.alignmentMask), value); } else { - return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask, handle.nested), value); + return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, handle.alignmentMask), value); } } diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java index a11480d5787f3..563870381febf 100644 --- a/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java +++ b/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java @@ -75,7 +75,7 @@ public interface JavaLangInvokeAccess { * Used by {@code jdk.internal.foreign.LayoutPath} and * {@code java.lang.invoke.MethodHandles}. */ - VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, ByteOrder order, boolean nested); + VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, ByteOrder order); /** * Var handle carrier combinator. diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java index 0fb41bf720849..9649d479b15d3 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java +++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java @@ -207,7 +207,7 @@ public VarHandle dereferenceHandle(boolean adapt) { String.format("Path does not select a value layout: %s", breadcrumbs())); } - VarHandle handle = Utils.makeSegmentViewVarHandle(valueLayout, true); + VarHandle handle = Utils.makeSegmentViewVarHandle(valueLayout); handle = MethodHandles.collectCoordinates(handle, 1, offsetHandle()); // we only have to check the alignment of the root layout for the first dereference we do, diff --git a/src/java.base/share/classes/jdk/internal/foreign/Utils.java b/src/java.base/share/classes/jdk/internal/foreign/Utils.java index 7c1afc3957799..5ea659fc7c3c4 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/Utils.java +++ b/src/java.base/share/classes/jdk/internal/foreign/Utils.java @@ -89,19 +89,7 @@ public static MemorySegment alignUp(MemorySegment ms, long alignment) { return ms.asSlice(alignUp(offset, alignment) - offset); } - public static VarHandle makeSegmentViewVarHandle(ValueLayout layout, boolean nested) { - return makeNestedSegmentViewVarHandle(layout); - } - - private static VarHandle makeToplevelSegmentViewVarHandle(ValueLayout layout) { - return makeSegmentViewVarHandleInternal(layout, false); - } - - private static VarHandle makeNestedSegmentViewVarHandle(ValueLayout layout) { - return makeSegmentViewVarHandleInternal(layout, true); - } - - private static VarHandle makeSegmentViewVarHandleInternal(ValueLayout layout, boolean nested) { + public static VarHandle makeSegmentViewVarHandle(ValueLayout layout) { Class baseCarrier = layout.carrier(); if (layout.carrier() == MemorySegment.class) { baseCarrier = switch ((int) ValueLayout.ADDRESS.byteSize()) { @@ -114,7 +102,7 @@ private static VarHandle makeSegmentViewVarHandleInternal(ValueLayout layout, bo } VarHandle handle = SharedSecrets.getJavaLangInvokeAccess().memorySegmentViewHandle(baseCarrier, - layout.byteAlignment() - 1, layout.order(), nested); + layout.byteAlignment() - 1, layout.order()); if (layout.carrier() == boolean.class) { handle = MethodHandles.filterValue(handle, BOOL_TO_BYTE, BYTE_TO_BOOL); From b1417400537f03038703a66d7c68ddd7007326cf Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Thu, 16 May 2024 11:10:24 +0100 Subject: [PATCH 15/19] Revert test changes --- test/jdk/java/foreign/TestAccessModes.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java index 54a999a8c6c7d..1a94eae5b1578 100644 --- a/test/jdk/java/foreign/TestAccessModes.java +++ b/test/jdk/java/foreign/TestAccessModes.java @@ -24,6 +24,9 @@ /* * @test * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes + * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes + * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes + * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes */ import java.lang.foreign.*; From 6a7f6a7cbcdba75d0a72c2bb6e00b0dc5f74ed65 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Thu, 16 May 2024 11:25:37 +0100 Subject: [PATCH 16/19] Simplify var handle code Add comment --- .../lang/invoke/VarHandleSegmentViewBase.java | 10 +-- .../classes/java/lang/invoke/VarHandles.java | 18 ++-- .../X-VarHandleSegmentView.java.template | 88 +++++++++---------- .../jdk/internal/foreign/LayoutPath.java | 2 - .../classes/jdk/internal/foreign/Utils.java | 2 - 5 files changed, 55 insertions(+), 65 deletions(-) diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java index 5cb71cf042456..dd4c6e07bfc1f 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java @@ -42,23 +42,15 @@ abstract sealed class VarHandleSegmentViewBase extends VarHandle permits /** endianness **/ final boolean be; - /** access size (in bytes, computed from var handle carrier type) **/ - final long length; - /** alignment constraint (in bytes, expressed as a bit mask) **/ final long alignmentMask; - VarHandleSegmentViewBase(VarForm form, boolean be, long length, long alignmentMask, boolean exact) { + VarHandleSegmentViewBase(VarForm form, boolean be, long alignmentMask, boolean exact) { super(form, exact); this.be = be; - this.length = length; this.alignmentMask = alignmentMask; } - static IllegalArgumentException newIllegalArgumentExceptionForMisalignedAccess(long address) { - return new IllegalArgumentException("Misaligned access at address: " + Utils.toHexString(address)); - } - static UnsupportedOperationException newUnsupportedAccessModeForAlignment(long alignment) { return new UnsupportedOperationException("Unsupported access mode for alignment: " + alignment); } diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java index 0a3932004476f..886e3af21e6e0 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandles.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandles.java @@ -306,6 +306,9 @@ else if (viewComponentType == float.class) { * The resulting var handle will take a memory segment as first argument (the segment to be dereferenced), * and a {@code long} as second argument (the offset into the segment). * + * Note: the returned var handle does not perform any size or alignment check. It is up to clients + * to adapt the returned var handle and insert the appropriate checks. + * * @param carrier the Java carrier type. * @param alignmentMask alignment requirement to be checked upon access. In bytes. Expressed as a mask. * @param byteOrder the byte order. @@ -316,24 +319,23 @@ static VarHandle memorySegmentViewHandle(Class carrier, long alignmentMask, if (!carrier.isPrimitive() || carrier == void.class || carrier == boolean.class) { throw new IllegalArgumentException("Invalid carrier: " + carrier.getName()); } - long size = Utils.byteWidthOfPrimitive(carrier); boolean be = byteOrder == ByteOrder.BIG_ENDIAN; boolean exact = VAR_HANDLE_SEGMENT_FORCE_EXACT; if (carrier == byte.class) { - return maybeAdapt(new VarHandleSegmentAsBytes(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsBytes(be, alignmentMask, exact)); } else if (carrier == char.class) { - return maybeAdapt(new VarHandleSegmentAsChars(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsChars(be, alignmentMask, exact)); } else if (carrier == short.class) { - return maybeAdapt(new VarHandleSegmentAsShorts(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsShorts(be, alignmentMask, exact)); } else if (carrier == int.class) { - return maybeAdapt(new VarHandleSegmentAsInts(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsInts(be, alignmentMask, exact)); } else if (carrier == float.class) { - return maybeAdapt(new VarHandleSegmentAsFloats(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsFloats(be, alignmentMask, exact)); } else if (carrier == long.class) { - return maybeAdapt(new VarHandleSegmentAsLongs(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsLongs(be, alignmentMask, exact)); } else if (carrier == double.class) { - return maybeAdapt(new VarHandleSegmentAsDoubles(be, size, alignmentMask, exact)); + return maybeAdapt(new VarHandleSegmentAsDoubles(be, alignmentMask, exact)); } else { throw new IllegalStateException("Cannot get here"); } diff --git a/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template index a4901a571af5f..0c088cd5c4b45 100644 --- a/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template +++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template @@ -47,8 +47,8 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { static final VarForm FORM = new VarForm(VarHandleSegmentAs$Type$s.class, MemorySegment.class, $type$.class, long.class); - VarHandleSegmentAs$Type$s(boolean be, long length, long alignmentMask, boolean exact) { - super(FORM, be, length, alignmentMask, exact); + VarHandleSegmentAs$Type$s(boolean be, long alignmentMask, boolean exact) { + super(FORM, be, alignmentMask, exact); } @Override @@ -60,14 +60,14 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { public VarHandleSegmentAs$Type$s withInvokeExactBehavior() { return hasInvokeExactBehavior() ? this : - new VarHandleSegmentAs$Type$s(be, length, alignmentMask, true); + new VarHandleSegmentAs$Type$s(be, alignmentMask, true); } @Override public VarHandleSegmentAs$Type$s withInvokeBehavior() { return !hasInvokeExactBehavior() ? this : - new VarHandleSegmentAs$Type$s(be, length, alignmentMask, false); + new VarHandleSegmentAs$Type$s(be, alignmentMask, false); } #if[floatingPoint] @@ -97,7 +97,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { #end[floatingPoint] @ForceInline - static AbstractMemorySegmentImpl checkAddress(Object obb, long offset, long length, boolean ro) { + static AbstractMemorySegmentImpl checkReadOnly(Object obb, boolean ro) { AbstractMemorySegmentImpl oo = (AbstractMemorySegmentImpl)Objects.requireNonNull(obb); oo.checkReadOnly(ro); return oo; @@ -108,11 +108,11 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { if ((alignmentMask & NON_PLAIN_ACCESS_MIN_ALIGN_MASK) != NON_PLAIN_ACCESS_MIN_ALIGN_MASK) { throw VarHandleSegmentViewBase.newUnsupportedAccessModeForAlignment(alignmentMask + 1); } - return offsetPlain(bb, offset, alignmentMask); + return offsetPlain(bb, offset); } @ForceInline - static long offsetPlain(AbstractMemorySegmentImpl bb, long offset, long alignmentMask) { + static long offsetPlain(AbstractMemorySegmentImpl bb, long offset) { long base = bb.unsafeGetOffset(); return base + offset; } @@ -120,22 +120,22 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ get(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, true); #if[floatingPoint] $rawType$ rawValue = SCOPED_MEMORY_ACCESS.get$RawType$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base), handle.be); return $Type$.$rawType$BitsTo$Type$(rawValue); #else[floatingPoint] #if[byte] return SCOPED_MEMORY_ACCESS.get$Type$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask)); + offsetPlain(bb, base)); #else[byte] return SCOPED_MEMORY_ACCESS.get$Type$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base), handle.be); #end[byte] #end[floatingPoint] @@ -144,23 +144,23 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static void set(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); #if[floatingPoint] SCOPED_MEMORY_ACCESS.put$RawType$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base), $Type$.$type$ToRaw$RawType$Bits(value), handle.be); #else[floatingPoint] #if[byte] SCOPED_MEMORY_ACCESS.put$Type$(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base), value); #else[byte] SCOPED_MEMORY_ACCESS.put$Type$Unaligned(bb.sessionImpl(), bb.unsafeGetBase(), - offsetPlain(bb, base, handle.alignmentMask), + offsetPlain(bb, base), value, handle.be); #end[byte] @@ -170,7 +170,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getVolatile(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, true); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Volatile(bb.sessionImpl(), bb.unsafeGetBase(), @@ -180,7 +180,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static void setVolatile(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); SCOPED_MEMORY_ACCESS.put$RawType$Volatile(bb.sessionImpl(), bb.unsafeGetBase(), offsetNonPlain(bb, base, handle.alignmentMask), @@ -190,7 +190,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAcquire(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, true); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), @@ -200,7 +200,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static void setRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); SCOPED_MEMORY_ACCESS.put$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), offsetNonPlain(bb, base, handle.alignmentMask), @@ -210,7 +210,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getOpaque(VarHandle ob, Object obb, long base) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, true); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, true); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.get$RawType$Opaque(bb.sessionImpl(), bb.unsafeGetBase(), @@ -220,7 +220,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static void setOpaque(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); SCOPED_MEMORY_ACCESS.put$RawType$Opaque(bb.sessionImpl(), bb.unsafeGetBase(), offsetNonPlain(bb, base, handle.alignmentMask), @@ -231,7 +231,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static boolean compareAndSet(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return SCOPED_MEMORY_ACCESS.compareAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), offsetNonPlain(bb, base, handle.alignmentMask), @@ -241,7 +241,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ compareAndExchange(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), @@ -252,7 +252,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ compareAndExchangeAcquire(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), @@ -263,7 +263,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ compareAndExchangeRelease(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), @@ -274,7 +274,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static boolean weakCompareAndSetPlain(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Plain(bb.sessionImpl(), bb.unsafeGetBase(), offsetNonPlain(bb, base, handle.alignmentMask), @@ -284,7 +284,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static boolean weakCompareAndSet(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), offsetNonPlain(bb, base, handle.alignmentMask), @@ -294,7 +294,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static boolean weakCompareAndSetAcquire(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), offsetNonPlain(bb, base, handle.alignmentMask), @@ -304,7 +304,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static boolean weakCompareAndSetRelease(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), offsetNonPlain(bb, base, handle.alignmentMask), @@ -314,7 +314,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndSet(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), @@ -325,7 +325,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndSetAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), @@ -336,7 +336,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndSetRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); return convEndian(handle.be, SCOPED_MEMORY_ACCESS.getAndSet$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), @@ -349,7 +349,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndAdd(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), @@ -363,7 +363,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndAddAcquire(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), @@ -377,7 +377,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndAddRelease(VarHandle ob, Object obb, long base, $type$ delta) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), @@ -405,7 +405,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseOr(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), @@ -419,7 +419,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseOrRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), @@ -433,7 +433,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseOrAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), @@ -459,7 +459,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseAnd(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), @@ -473,7 +473,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseAndRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), @@ -487,7 +487,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseAndAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), @@ -514,7 +514,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseXor(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$(bb.sessionImpl(), bb.unsafeGetBase(), @@ -528,7 +528,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseXorRelease(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$Release(bb.sessionImpl(), bb.unsafeGetBase(), @@ -542,7 +542,7 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase { @ForceInline static $type$ getAndBitwiseXorAcquire(VarHandle ob, Object obb, long base, $type$ value) { VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob; - AbstractMemorySegmentImpl bb = checkAddress(obb, base, handle.length, false); + AbstractMemorySegmentImpl bb = checkReadOnly(obb, false); if (handle.be == BE) { return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$Acquire(bb.sessionImpl(), bb.unsafeGetBase(), diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java index 9649d479b15d3..92b94fe612e24 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java +++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java @@ -25,8 +25,6 @@ */ package jdk.internal.foreign; -import jdk.internal.access.JavaLangInvokeAccess; -import jdk.internal.access.SharedSecrets; import jdk.internal.vm.annotation.ForceInline; import java.lang.foreign.AddressLayout; diff --git a/src/java.base/share/classes/jdk/internal/foreign/Utils.java b/src/java.base/share/classes/jdk/internal/foreign/Utils.java index 5ea659fc7c3c4..cc1e7ef299ba4 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/Utils.java +++ b/src/java.base/share/classes/jdk/internal/foreign/Utils.java @@ -37,8 +37,6 @@ import java.lang.invoke.VarHandle; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; import jdk.internal.access.SharedSecrets; From 236007c39e651114169a1cd5f5ad629297033f35 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Thu, 16 May 2024 11:50:16 +0100 Subject: [PATCH 17/19] Revert commented lines in test --- test/jdk/java/foreign/TestAccessModes.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java index 1a94eae5b1578..0cedcc9058e2b 100644 --- a/test/jdk/java/foreign/TestAccessModes.java +++ b/test/jdk/java/foreign/TestAccessModes.java @@ -137,15 +137,15 @@ static Set supportedModes(ValueLayout layout) { static MemoryLayout[] layouts() { MemoryLayout[] valueLayouts = { -// ValueLayout.JAVA_BOOLEAN, -// ValueLayout.JAVA_CHAR, -// ValueLayout.JAVA_BYTE, -// ValueLayout.JAVA_SHORT, -// ValueLayout.JAVA_INT, -// ValueLayout.JAVA_FLOAT, + ValueLayout.JAVA_BOOLEAN, + ValueLayout.JAVA_CHAR, + ValueLayout.JAVA_BYTE, + ValueLayout.JAVA_SHORT, + ValueLayout.JAVA_INT, + ValueLayout.JAVA_FLOAT, ValueLayout.JAVA_LONG, -// ValueLayout.JAVA_DOUBLE, -// ValueLayout.ADDRESS + ValueLayout.JAVA_DOUBLE, + ValueLayout.ADDRESS }; List layouts = new ArrayList<>(); for (MemoryLayout layout : valueLayouts) { @@ -159,14 +159,14 @@ static MemoryLayout[] layouts() { static MemorySegment[] segments() { return new MemorySegment[]{ -// Arena.ofAuto().allocate(8), + Arena.ofAuto().allocate(8), MemorySegment.ofArray(new byte[8]), -// MemorySegment.ofArray(new char[4]), -// MemorySegment.ofArray(new short[4]), -// MemorySegment.ofArray(new int[2]), -// MemorySegment.ofArray(new float[2]), -// MemorySegment.ofArray(new long[1]), -// MemorySegment.ofArray(new double[1]) + MemorySegment.ofArray(new char[4]), + MemorySegment.ofArray(new short[4]), + MemorySegment.ofArray(new int[2]), + MemorySegment.ofArray(new float[2]), + MemorySegment.ofArray(new long[1]), + MemorySegment.ofArray(new double[1]) }; } From a7b09d9d2b9e38efc88f6879527b8fd3cb1261af Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Thu, 16 May 2024 15:33:36 +0100 Subject: [PATCH 18/19] Fix copyrights --- .../classes/java/lang/invoke/VarHandleSegmentViewBase.java | 4 +--- src/java.base/share/classes/java/lang/invoke/VarHandles.java | 2 +- src/java.base/share/classes/jdk/internal/foreign/Utils.java | 2 +- .../classes/jdk/internal/foreign/layout/ValueLayouts.java | 3 +-- test/jdk/java/foreign/TestHeapAlignment.java | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java index dd4c6e07bfc1f..31ec02c3d7c96 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.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 @@ -25,8 +25,6 @@ package java.lang.invoke; -import jdk.internal.foreign.Utils; - /** * Base class for memory segment var handle view implementations. */ diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java index 886e3af21e6e0..bd608619e58ec 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandles.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandles.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 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 diff --git a/src/java.base/share/classes/jdk/internal/foreign/Utils.java b/src/java.base/share/classes/jdk/internal/foreign/Utils.java index cc1e7ef299ba4..f05666b88b691 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/Utils.java +++ b/src/java.base/share/classes/jdk/internal/foreign/Utils.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 diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java index dfc866346da66..4d19879b01acd 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java +++ b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.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 @@ -34,7 +34,6 @@ import java.lang.foreign.AddressLayout; import java.lang.foreign.MemoryLayout; -import java.lang.foreign.MemoryLayout.PathElement; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; import java.lang.invoke.VarHandle; diff --git a/test/jdk/java/foreign/TestHeapAlignment.java b/test/jdk/java/foreign/TestHeapAlignment.java index f43ec188c54ae..cc8a95465108c 100644 --- a/test/jdk/java/foreign/TestHeapAlignment.java +++ b/test/jdk/java/foreign/TestHeapAlignment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 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 From 14f0b8b36317a457206f4b32df97f990c13080c9 Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Fri, 17 May 2024 18:11:34 +0100 Subject: [PATCH 19/19] Fix typo in javadoc --- .../share/classes/java/lang/foreign/MemoryLayout.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java index fab37c85f47c1..372b10aab1389 100644 --- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java +++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java @@ -627,7 +627,7 @@ public sealed interface MemoryLayout * (but not less) than the alignment constraint of the selected value layout. *
  • The access operation must fall inside the spatial bounds of the accessed * memory segment, or an {@link IndexOutOfBoundsException} is thrown. This is the case - * when {@code B + A <= S}, where {@code O} is the base offset (defined above), + * when {@code B + A <= S}, where {@code B} is the base offset (defined above), * {@code A} is the size of this layout and {@code S} is the size of the * accessed memory segment. Note that the size of this layout might be bigger * than the size of the accessed layout (e.g. when accessing a struct member).
    • @@ -755,7 +755,7 @@ public sealed interface MemoryLayout * (but not less) than the alignment constraint of the selected value layout. *
  • The access operation must fall inside the spatial bounds of the accessed * memory segment, or an {@link IndexOutOfBoundsException} is thrown. This is the case - * when {@code B + A <= S}, where {@code O} is the base offset (defined above), + * when {@code B + A <= S}, where {@code B} is the base offset (defined above), * {@code A} is the size of this layout and {@code S} is the size of the * accessed memory segment. Note that the size of this layout might be bigger * than the size of the accessed layout (e.g. when accessing a struct member).
    • @@ -824,7 +824,7 @@ public sealed interface MemoryLayout * (but not less) than the alignment constraint of the selected layout. *
  • The slicing operation must fall inside the spatial bounds of the accessed * memory segment, or an {@link IndexOutOfBoundsException} is thrown. This is the case - * when {@code B + A <= S}, where {@code O} is the base offset (defined above), + * when {@code B + A <= S}, where {@code B} is the base offset (defined above), * {@code A} is the size of this layout and {@code S} is the size of the * accessed memory segment. Note that the size of this layout might be bigger * than the size of the accessed layout (e.g. when accessing a struct member).