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

8344912: Sharpen the return type of various internal methods in jdk.internal.foreign

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Quan Anh Mai 2024-11-27 07:35:51 +00:00
parent 1f6144ef26
commit 57ee3ba7e1
8 changed files with 54 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
View File

@ -141,15 +141,14 @@ public abstract sealed class AbstractMemorySegmentImpl
MemorySessionImpl.toMemorySession(arena), cleanup);
}
public MemorySegment reinterpretInternal(Class<?> callerClass, long newSize, Scope scope, Consumer<MemorySegment> cleanup) {
private NativeMemorySegmentImpl reinterpretInternal(Class<?> callerClass, long newSize, MemorySessionImpl scope, Consumer<MemorySegment> cleanup) {
Reflection.ensureNativeAccess(callerClass, MemorySegment.class, "reinterpret", false);
Utils.checkNonNegativeArgument(newSize, "newSize");
if (!isNative()) throw new UnsupportedOperationException("Not a native segment");
Runnable action = cleanup != null ?
() -> cleanup.accept(SegmentFactories.makeNativeSegmentUnchecked(address(), newSize)) :
null;
return SegmentFactories.makeNativeSegmentUnchecked(address(), newSize,
(MemorySessionImpl)scope, readOnly, action);
return SegmentFactories.makeNativeSegmentUnchecked(address(), newSize, scope, readOnly, action);
}
private AbstractMemorySegmentImpl asSliceNoCheck(long offset, long newSize) {
@ -332,10 +331,6 @@ public abstract sealed class AbstractMemorySegmentImpl
checkBounds(offset, length);
}
public void checkValidState() {
sessionImpl().checkValidState();
}
@ForceInline
public final void checkEnclosingLayout(long offset, MemoryLayout enclosing, boolean readOnly) {
checkAccess(offset, enclosing.byteSize(), readOnly);
@ -394,7 +389,7 @@ public abstract sealed class AbstractMemorySegmentImpl
}
@Override
public Scope scope() {
public MemorySessionImpl scope() {
return scope;
}
@ -539,7 +534,7 @@ public abstract sealed class AbstractMemorySegmentImpl
}
@ForceInline
private static AbstractMemorySegmentImpl nativeSegment(Buffer b, long offset, long length) {
private static NativeMemorySegmentImpl nativeSegment(Buffer b, long offset, long length) {
if (!b.isDirect()) {
throw new IllegalArgumentException("The provided heap buffer is not backed by an array.");
}

11
src/java.base/share/classes/jdk/internal/foreign/ArenaImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -50,14 +50,15 @@ public final class ArenaImpl implements Arena {
session.close();
}
public MemorySegment allocateNoInit(long byteSize, long byteAlignment) {
public NativeMemorySegmentImpl allocateNoInit(long byteSize, long byteAlignment) {
Utils.checkAllocationSizeAndAlign(byteSize, byteAlignment);
return SegmentFactories.allocateSegment(byteSize, byteAlignment, session, shouldReserveMemory);
}
@Override
public MemorySegment allocate(long byteSize, long byteAlignment) {
MemorySegment segment = allocateNoInit(byteSize, byteAlignment);
return segment.fill((byte)0);
public NativeMemorySegmentImpl allocate(long byteSize, long byteAlignment) {
NativeMemorySegmentImpl segment = allocateNoInit(byteSize, byteAlignment);
segment.fill((byte)0);
return segment;
}
}

4
src/java.base/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 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
@ -35,7 +35,7 @@ import jdk.internal.misc.ScopedMemoryAccess;
* memory mapped segment, such as the file descriptor associated with the mapping. This information is crucial
* in order to correctly reconstruct a byte buffer object from the segment (see {@link #makeByteBuffer()}).
*/
final class MappedMemorySegmentImpl extends NativeMemorySegmentImpl {
public final class MappedMemorySegmentImpl extends NativeMemorySegmentImpl {
private final UnmapperProxy unmapper;

2
src/java.base/share/classes/jdk/internal/foreign/MemorySessionImpl.java
View File

@ -85,7 +85,7 @@ public abstract sealed class MemorySessionImpl
int acquireCount;
public Arena asArena() {
public ArenaImpl asArena() {
return new ArenaImpl(this);
}

2
src/java.base/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java
View File

@ -36,7 +36,7 @@ import jdk.internal.vm.annotation.ForceInline;
* Implementation for native memory segments. A native memory segment is essentially a wrapper around
* a native long address.
*/
sealed class NativeMemorySegmentImpl extends AbstractMemorySegmentImpl permits MappedMemorySegmentImpl {
public sealed class NativeMemorySegmentImpl extends AbstractMemorySegmentImpl permits MappedMemorySegmentImpl {
final long min;

2
src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
View File

@ -62,7 +62,7 @@ public final class SegmentBulkOperations {
dst.checkReadOnly(false);
if (dst.length == 0) {
// Implicit state check
dst.checkValidState();
dst.sessionImpl().checkValidState();
} else if (dst.length < NATIVE_THRESHOLD_FILL) {
// 0 <= length < FILL_NATIVE_LIMIT : 0...0X...XXXX

101
src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
View File

@ -57,11 +57,9 @@ public class SegmentFactories {
// associated with MemorySegment::ofAddress.
@ForceInline
public static MemorySegment makeNativeSegmentUnchecked(long min,
long byteSize,
MemorySessionImpl sessionImpl,
boolean readOnly,
Runnable action) {
public static NativeMemorySegmentImpl makeNativeSegmentUnchecked(long min, long byteSize,
MemorySessionImpl sessionImpl,
boolean readOnly, Runnable action) {
ensureInitialized();
if (action == null) {
sessionImpl.checkValidState();
@ -72,19 +70,19 @@ public class SegmentFactories {
}
@ForceInline
public static MemorySegment makeNativeSegmentUnchecked(long min, long byteSize, MemorySessionImpl sessionImpl) {
public static NativeMemorySegmentImpl makeNativeSegmentUnchecked(long min, long byteSize, MemorySessionImpl sessionImpl) {
ensureInitialized();
sessionImpl.checkValidState();
return new NativeMemorySegmentImpl(min, byteSize, false, sessionImpl);
}
@ForceInline
public static MemorySegment makeNativeSegmentUnchecked(long min, long byteSize) {
public static NativeMemorySegmentImpl makeNativeSegmentUnchecked(long min, long byteSize) {
ensureInitialized();
return new NativeMemorySegmentImpl(min, byteSize, false, MemorySessionImpl.GLOBAL_SESSION);
}
public static MemorySegment fromArray(byte[] arr) {
public static OfByte fromArray(byte[] arr) {
ensureInitialized();
Objects.requireNonNull(arr);
long byteSize = (long)arr.length * Utils.BaseAndScale.BYTE.scale();
@ -92,7 +90,7 @@ public class SegmentFactories {
MemorySessionImpl.createHeap(arr));
}
public static MemorySegment fromArray(short[] arr) {
public static OfShort fromArray(short[] arr) {
ensureInitialized();
Objects.requireNonNull(arr);
long byteSize = (long)arr.length * Utils.BaseAndScale.SHORT.scale();
@ -100,7 +98,7 @@ public class SegmentFactories {
MemorySessionImpl.createHeap(arr));
}
public static MemorySegment fromArray(int[] arr) {
public static OfInt fromArray(int[] arr) {
ensureInitialized();
Objects.requireNonNull(arr);
long byteSize = (long)arr.length * Utils.BaseAndScale.INT.scale();
@ -108,7 +106,7 @@ public class SegmentFactories {
MemorySessionImpl.createHeap(arr));
}
public static MemorySegment fromArray(char[] arr) {
public static OfChar fromArray(char[] arr) {
ensureInitialized();
Objects.requireNonNull(arr);
long byteSize = (long)arr.length * Utils.BaseAndScale.CHAR.scale();
@ -116,7 +114,7 @@ public class SegmentFactories {
MemorySessionImpl.createHeap(arr));
}
public static MemorySegment fromArray(float[] arr) {
public static OfFloat fromArray(float[] arr) {
ensureInitialized();
Objects.requireNonNull(arr);
long byteSize = (long)arr.length * Utils.BaseAndScale.FLOAT.scale();
@ -124,7 +122,7 @@ public class SegmentFactories {
MemorySessionImpl.createHeap(arr));
}
public static MemorySegment fromArray(double[] arr) {
public static OfDouble fromArray(double[] arr) {
ensureInitialized();
Objects.requireNonNull(arr);
long byteSize = (long)arr.length * Utils.BaseAndScale.DOUBLE.scale();
@ -132,7 +130,7 @@ public class SegmentFactories {
MemorySessionImpl.createHeap(arr));
}
public static MemorySegment fromArray(long[] arr) {
public static OfLong fromArray(long[] arr) {
ensureInitialized();
Objects.requireNonNull(arr);
long byteSize = (long)arr.length * Utils.BaseAndScale.LONG.scale();
@ -142,64 +140,43 @@ public class SegmentFactories {
// Buffer conversion factories
public static AbstractMemorySegmentImpl arrayOfByteSegment(Object base,
long offset,
long length,
boolean readOnly,
MemorySessionImpl bufferScope) {
return new HeapMemorySegmentImpl.OfByte(offset, base, length, readOnly, bufferScope);
public static OfByte arrayOfByteSegment(Object base, long offset, long length,
boolean readOnly, MemorySessionImpl bufferScope) {
return new OfByte(offset, base, length, readOnly, bufferScope);
}
public static AbstractMemorySegmentImpl arrayOfShortSegment(Object base,
long offset,
long length,
boolean readOnly,
MemorySessionImpl bufferScope) {
return new HeapMemorySegmentImpl.OfShort(offset, base, length, readOnly, bufferScope);
public static OfShort arrayOfShortSegment(Object base, long offset, long length,
boolean readOnly, MemorySessionImpl bufferScope) {
return new OfShort(offset, base, length, readOnly, bufferScope);
}
public static AbstractMemorySegmentImpl arrayOfCharSegment(Object base,
long offset,
long length,
boolean readOnly,
MemorySessionImpl bufferScope) {
return new HeapMemorySegmentImpl.OfChar(offset, base, length, readOnly, bufferScope);
public static OfChar arrayOfCharSegment(Object base, long offset, long length,
boolean readOnly, MemorySessionImpl bufferScope) {
return new OfChar(offset, base, length, readOnly, bufferScope);
}
public static AbstractMemorySegmentImpl arrayOfIntSegment(Object base,
long offset,
long length,
boolean readOnly,
MemorySessionImpl bufferScope) {
return new HeapMemorySegmentImpl.OfInt(offset, base, length, readOnly, bufferScope);
public static OfInt arrayOfIntSegment(Object base, long offset, long length,
boolean readOnly, MemorySessionImpl bufferScope) {
return new OfInt(offset, base, length, readOnly, bufferScope);
}
public static AbstractMemorySegmentImpl arrayOfFloatSegment(Object base,
long offset,
long length,
boolean readOnly,
MemorySessionImpl bufferScope) {
return new HeapMemorySegmentImpl.OfFloat(offset, base, length, readOnly, bufferScope);
public static OfFloat arrayOfFloatSegment(Object base, long offset, long length,
boolean readOnly, MemorySessionImpl bufferScope) {
return new OfFloat(offset, base, length, readOnly, bufferScope);
}
public static AbstractMemorySegmentImpl arrayOfLongSegment(Object base,
long offset,
long length,
boolean readOnly,
MemorySessionImpl bufferScope) {
return new HeapMemorySegmentImpl.OfLong(offset, base, length, readOnly, bufferScope);
public static OfLong arrayOfLongSegment(Object base, long offset, long length,
boolean readOnly, MemorySessionImpl bufferScope) {
return new OfLong(offset, base, length, readOnly, bufferScope);
}
public static AbstractMemorySegmentImpl arrayOfDoubleSegment(Object base,
long offset,
long length,
boolean readOnly,
MemorySessionImpl bufferScope) {
return new HeapMemorySegmentImpl.OfDouble(offset, base, length, readOnly, bufferScope);
public static OfDouble arrayOfDoubleSegment(Object base, long offset, long length,
boolean readOnly, MemorySessionImpl bufferScope) {
return new OfDouble(offset, base, length, readOnly, bufferScope);
}
public static MemorySegment allocateSegment(long byteSize, long byteAlignment, MemorySessionImpl sessionImpl,
boolean shouldReserve) {
public static NativeMemorySegmentImpl allocateSegment(long byteSize, long byteAlignment, MemorySessionImpl sessionImpl,
boolean shouldReserve) {
ensureInitialized();
sessionImpl.checkValidState();
if (VM.isDirectMemoryPageAligned()) {
@ -215,7 +192,7 @@ public class SegmentFactories {
long buf = allocateMemoryWrapper(alignedSize);
long alignedBuf = Utils.alignUp(buf, byteAlignment);
AbstractMemorySegmentImpl segment = new NativeMemorySegmentImpl(buf, alignedSize,
NativeMemorySegmentImpl segment = new NativeMemorySegmentImpl(buf, alignedSize,
false, sessionImpl);
sessionImpl.addOrCleanupIfFail(new MemorySessionImpl.ResourceList.ResourceCleanup() {
@Override
@ -228,7 +205,7 @@ public class SegmentFactories {
});
if (alignedSize != byteSize) {
long delta = alignedBuf - buf;
segment = segment.asSlice(delta, byteSize);
segment = (NativeMemorySegmentImpl) segment.asSlice(delta, byteSize);
}
return segment;
}
@ -241,10 +218,10 @@ public class SegmentFactories {
}
}
public static MemorySegment mapSegment(long size, UnmapperProxy unmapper, boolean readOnly, MemorySessionImpl sessionImpl) {
public static MappedMemorySegmentImpl mapSegment(long size, UnmapperProxy unmapper, boolean readOnly, MemorySessionImpl sessionImpl) {
ensureInitialized();
if (unmapper != null) {
AbstractMemorySegmentImpl segment =
MappedMemorySegmentImpl segment =
new MappedMemorySegmentImpl(unmapper.address(), unmapper, size,
readOnly, sessionImpl);
MemorySessionImpl.ResourceList.ResourceCleanup resource =

1
src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java
View File

@ -46,7 +46,6 @@ import java.lang.invoke.MethodHandles;
import static java.lang.invoke.MethodHandles.foldArguments;
import java.lang.invoke.MethodType;
import java.lang.ref.Reference;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;