Tweak prefixAllocator

Tweak StrLenTest
mcimadamore · Oct 29, 2024 · 75394a9 · 75394a9
1 parent 3b24b9c
commit 75394a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/java.base/share/classes/java/lang/foreign/SegmentAllocator.java b/src/java.base/share/classes/java/lang/foreign/SegmentAllocator.java
@@ -707,7 +707,7 @@ static SegmentAllocator slicingAllocator(MemorySegment segment) {
      * @throws IllegalArgumentException if the {@code segment} is
      *         {@linkplain MemorySegment#isReadOnly() read-only}
      */
-    static SegmentAllocator prefixAllocator(MemorySegment segment) {
+    static SegmentAllocator.OfRaw prefixAllocator(MemorySegment segment) {
         assertWritable(segment);
         return (AbstractMemorySegmentImpl)segment;
     }

diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
@@ -145,7 +145,7 @@ static String makeString(int size) {
         return lorem.substring(0, size);
     }
 
-    static class RingAllocator implements SegmentAllocator {
+    static class RingAllocator implements SegmentAllocator.OfRaw {
         final MemorySegment segment;
         SegmentAllocator current;
         long rem;
@@ -156,7 +156,7 @@ public RingAllocator(Arena session) {
         }
 
         @Override
-        public MemorySegment allocate(long byteSize, long byteAlignment) {
+        public MemorySegment allocateRaw(long byteSize, long byteAlignment) {
             if (rem < byteSize) {
                 reset();
             }
@@ -184,16 +184,21 @@ public Arena acquire() {
             return new SlicingPoolAllocator();
         }
 
-        class SlicingPoolAllocator implements Arena {
+        class SlicingPoolAllocator implements Arena, SegmentAllocator.OfRaw {
 
             final Arena arena = Arena.ofConfined();
             final SegmentAllocator slicing = SegmentAllocator.slicingAllocator(pool);
 
-            public MemorySegment allocate(long byteSize, long byteAlignment) {
+            public MemorySegment allocateRaw(long byteSize, long byteAlignment) {
                 return slicing.allocate(byteSize, byteAlignment)
                         .reinterpret(arena, null);
             }
 
+            @Override
+            public MemorySegment allocate(long byteSize, long byteAlignment) {
+                return SegmentAllocator.OfRaw.super.allocate(byteSize, byteAlignment);
+            }
+
             @Override
             public Scope scope() {
                 return arena.scope();