> {
/**
* Attribute stability indicator
diff --git a/src/java.base/share/classes/java/lang/classfile/package-info.java b/src/java.base/share/classes/java/lang/classfile/package-info.java
index 921cf9e1a3443..6e9ecfe4819e6 100644
--- a/src/java.base/share/classes/java/lang/classfile/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/package-info.java
@@ -147,7 +147,7 @@
* ClassReader, int)} method for mapping from the classfile format
* to an attribute instance, and the
* {@link java.lang.classfile.AttributeMapper#writeAttribute(java.lang.classfile.BufWriter,
- * java.lang.Object)} method for mapping back to the classfile format. It also
+ * java.lang.classfile.Attribute)} method for mapping back to the classfile format. It also
* contains metadata including the attribute name, the set of classfile entities
* where the attribute is applicable, and whether multiple attributes of the
* same kind are allowed on a single entity.
diff --git a/src/java.base/share/classes/java/lang/foreign/AddressLayout.java b/src/java.base/share/classes/java/lang/foreign/AddressLayout.java
index 49cab25a75fb5..6e188c5a3171e 100644
--- a/src/java.base/share/classes/java/lang/foreign/AddressLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/AddressLayout.java
@@ -108,7 +108,7 @@ public sealed interface AddressLayout extends ValueLayout permits ValueLayouts.O
* @param layout the target layout
* @return an address layout with same characteristics as this layout, but with the
* provided target layout
- * @throws IllegalCallerException If the caller is in a module that does not have
+ * @throws IllegalCallerException if the caller is in a module that does not have
* native access enabled
* @see #targetLayout()
*/
diff --git a/src/java.base/share/classes/java/lang/foreign/Linker.java b/src/java.base/share/classes/java/lang/foreign/Linker.java
index fd6e820d01662..5474fef66da13 100644
--- a/src/java.base/share/classes/java/lang/foreign/Linker.java
+++ b/src/java.base/share/classes/java/lang/foreign/Linker.java
@@ -613,7 +613,7 @@ static Linker nativeLinker() {
* {@code address.equals(MemorySegment.NULL)}
* @throws IllegalArgumentException if an invalid combination of linker options
* is given
- * @throws IllegalCallerException If the caller is in a module that does not have
+ * @throws IllegalCallerException if the caller is in a module that does not have
* native access enabled
*
* @see SymbolLookup
@@ -684,7 +684,7 @@ MethodHandle downcallHandle(MemorySegment address,
* supported by this linker
* @throws IllegalArgumentException if an invalid combination of linker options
* is given
- * @throws IllegalCallerException If the caller is in a module that does not have
+ * @throws IllegalCallerException if the caller is in a module that does not have
* native access enabled
*/
@CallerSensitive
@@ -733,7 +733,7 @@ MethodHandle downcallHandle(MemorySegment address,
* @throws IllegalStateException if {@code arena.scope().isAlive() == false}
* @throws WrongThreadException if {@code arena} is a confined arena, and this method
* is called from a thread {@code T}, other than the arena's owner thread
- * @throws IllegalCallerException If the caller is in a module that does not have
+ * @throws IllegalCallerException if the caller is in a module that does not have
* native access enabled
*/
@CallerSensitive
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 989fc134a2628..2cf0a5e4443cb 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
@@ -574,7 +574,9 @@ public sealed interface MemoryLayout
*
* For any given dynamic argument {@code x_i}, it must be that {@code 0 <= x_i < size_i},
* where {@code size_i} is the size of the open path element associated with {@code x_i}.
- * Otherwise, the returned method handle throws {@link IndexOutOfBoundsException}.
+ * Otherwise, the returned method handle throws {@link IndexOutOfBoundsException}. Moreover,
+ * the value of {@code b} must be such that the computation for {@code offset} does not overflow,
+ * or the returned method handle throws {@link ArithmeticException}.
*
* @apiNote The returned method handle can be used to compute a layout offset,
* similarly to {@link #byteOffset(PathElement...)}, but more flexibly, as
@@ -664,14 +666,15 @@ public sealed interface MemoryLayout
*
* If the provided layout path has size {@code m} and contains a dereference path
* element in position {@code k} (where {@code k <= m}) then two layout paths
- * {@code P} and {@code P'} are derived, where P contains all the path elements from
- * 0 to {@code k - 1} and {@code P'} contains all the path elements from {@code k + 1}
- * to {@code m} (if any). Then, the returned var handle is computed as follows:
+ * {@code P} and {@code Q} are derived, where P contains all the path elements from
+ * 0 to {@code k - 1} and {@code Q} contains all the path elements from {@code k + 1}
+ * to {@code m} ({@code Q} could be an empty layout path if {@code k == m}).
+ * Then, the returned var handle is computed as follows:
*
* {@snippet lang = "java":
* VarHandle baseHandle = this.varHandle(P);
* MemoryLayout target = ((AddressLayout)this.select(P)).targetLayout().get();
- * VarHandle targetHandle = target.varHandle(P);
+ * VarHandle targetHandle = target.varHandle(Q);
* targetHandle = MethodHandles.insertCoordinates(targetHandle, 1, 0L); // always access nested targets at offset 0
* targetHandle = MethodHandles.collectCoordinates(targetHandle, 0,
* baseHandle.toMethodHandle(VarHandle.AccessMode.GET));
@@ -944,7 +947,7 @@ static PathElement sequenceElement(long index) {
* is computed as follows:
*
* - if {@code F > 0}, then {@code B = ceilDiv(C - S, F)}
- * - if {@code F < 0}, then {@code B = ceilDiv(-(S + 1), -F)}
+ * - if {@code F < 0}, then {@code B = ceilDiv(S + 1, -F)}
*
* That is, the size of the returned open path element is {@code B}.
*
@@ -972,8 +975,8 @@ static PathElement sequenceElement() {
}
/**
- * {@return a path element that dereferences an address layout as its
- * {@linkplain AddressLayout#targetLayout() target layout} (where set)}
+ * {@return a path element that selects the {@linkplain AddressLayout#targetLayout() target layout} of
+ * an address layout (where set)}
*/
static PathElement dereferenceElement() {
return LayoutPath.DereferenceElement.instance();
diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
index 82f6b358a0752..8f171fd8bfbc9 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -475,7 +475,7 @@
* MemorySegment ptr = null;
* try (Arena arena = Arena.ofConfined()) {
* MemorySegment z = segment.get(ValueLayout.ADDRESS, ...); // size = 0, scope = always alive
- * ptr = z.reinterpret(16, arena, null); // size = 4, scope = arena.scope()
+ * ptr = z.reinterpret(16, arena, null); // size = 16, scope = arena.scope()
* int x = ptr.getAtIndex(ValueLayout.JAVA_INT, 3); // ok
* }
* int x = ptr.getAtIndex(ValueLayout.JAVA_INT, 3); // throws IllegalStateException
diff --git a/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java b/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
index a8838ea715c92..c6e4443b57007 100644
--- a/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
+++ b/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
@@ -285,14 +285,14 @@ static SymbolLookup loaderLookup() {
* @throws WrongThreadException if {@code arena} is a confined arena, and this method
* is called from a thread {@code T}, other than the arena's owner thread
* @throws IllegalArgumentException if {@code name} does not identify a valid library
- * @throws IllegalCallerException If the caller is in a module that does not have
+ * @throws IllegalCallerException if the caller is in a module that does not have
* native access enabled
*/
@CallerSensitive
@Restricted
static SymbolLookup libraryLookup(String name, Arena arena) {
Reflection.ensureNativeAccess(Reflection.getCallerClass(),
- SymbolLookup.class, "libraryLookup");
+ SymbolLookup.class, "libraryLookup", false);
if (Utils.containsNullChars(name)) {
throw new IllegalArgumentException("Cannot open library: " + name);
}
@@ -319,14 +319,14 @@ static SymbolLookup libraryLookup(String name, Arena arena) {
* is called from a thread {@code T}, other than the arena's owner thread
* @throws IllegalArgumentException if {@code path} does not point to a valid library
* in the default file system
- * @throws IllegalCallerException If the caller is in a module that does not have
+ * @throws IllegalCallerException if the caller is in a module that does not have
* native access enabled
*/
@CallerSensitive
@Restricted
static SymbolLookup libraryLookup(Path path, Arena arena) {
Reflection.ensureNativeAccess(Reflection.getCallerClass(),
- SymbolLookup.class, "libraryLookup");
+ SymbolLookup.class, "libraryLookup", false);
if (path.getFileSystem() != FileSystems.getDefault()) {
throw new IllegalArgumentException("Path not in default file system: " + path);
}
diff --git a/src/java.base/share/classes/java/lang/foreign/package-info.java b/src/java.base/share/classes/java/lang/foreign/package-info.java
index 6594826e40524..1f31301638e05 100644
--- a/src/java.base/share/classes/java/lang/foreign/package-info.java
+++ b/src/java.base/share/classes/java/lang/foreign/package-info.java
@@ -165,10 +165,11 @@
* In the reference implementation, access to restricted methods can be granted to
* specific modules using the command line option {@code --enable-native-access=M1,M2, ... Mn},
* where {@code M1}, {@code M2}, {@code ... Mn} are module names (for the unnamed module,
- * the special value {@code ALL-UNNAMED} can be used). If this option is specified,
- * access to restricted methods are only granted to the modules listed by that option.
- * If this option is not specified, access to restricted methods is enabled for all
- * modules, but access to restricted methods will result in runtime warnings.
+ * the special value {@code ALL-UNNAMED} can be used). Access to restricted methods
+ * from modules not listed by that option is deemed illegal. Clients can
+ * control how access to restricted methods is handled, using the command line
+ * option {@code --illegal-native-access}. If this option is not specified,
+ * illegal access to restricted methods will result in runtime warnings.
*
* @spec jni/index.html Java Native Interface Specification
*
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index dd2621935749f..870d4c063ec2e 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -29,6 +29,8 @@
import jdk.internal.access.JavaLangAccess;
import jdk.internal.access.SharedSecrets;
import jdk.internal.constant.ConstantUtils;
+import jdk.internal.constant.MethodTypeDescImpl;
+import jdk.internal.constant.ReferenceClassDescImpl;
import jdk.internal.misc.VM;
import jdk.internal.util.ClassFileDumper;
import jdk.internal.util.ReferenceKey;
@@ -1085,32 +1087,32 @@ private static final class InlineHiddenClassStrategy {
static final MethodHandles.Lookup STR_LOOKUP = new MethodHandles.Lookup(String.class);
static final ClassDesc CD_CONCAT = ConstantUtils.binaryNameToDesc(CLASS_NAME);
- static final ClassDesc CD_StringConcatHelper = ClassDesc.ofDescriptor("Ljava/lang/StringConcatHelper;");
- static final ClassDesc CD_StringConcatBase = ClassDesc.ofDescriptor("Ljava/lang/StringConcatHelper$StringConcatBase;");
- static final ClassDesc CD_Array_byte = ClassDesc.ofDescriptor("[B");
- static final ClassDesc CD_Array_String = ClassDesc.ofDescriptor("[Ljava/lang/String;");
-
- static final MethodTypeDesc MTD_byte_char = MethodTypeDesc.of(CD_byte, CD_char);
- static final MethodTypeDesc MTD_byte = MethodTypeDesc.of(CD_byte);
- static final MethodTypeDesc MTD_int = MethodTypeDesc.of(CD_int);
- static final MethodTypeDesc MTD_int_int_boolean = MethodTypeDesc.of(CD_int, CD_int, CD_boolean);
- static final MethodTypeDesc MTD_int_int_char = MethodTypeDesc.of(CD_int, CD_int, CD_char);
- static final MethodTypeDesc MTD_int_int_int = MethodTypeDesc.of(CD_int, CD_int, CD_int);
- static final MethodTypeDesc MTD_int_int_long = MethodTypeDesc.of(CD_int, CD_int, CD_long);
- static final MethodTypeDesc MTD_int_int_String = MethodTypeDesc.of(CD_int, CD_int, CD_String);
- static final MethodTypeDesc MTD_String_float = MethodTypeDesc.of(CD_String, CD_float);
- static final MethodTypeDesc MTD_String_double = MethodTypeDesc.of(CD_String, CD_double);
- static final MethodTypeDesc MTD_String_Object = MethodTypeDesc.of(CD_String, CD_Object);
-
- static final MethodTypeDesc MTD_INIT = MethodTypeDesc.of(CD_void, CD_Array_String);
- static final MethodTypeDesc MTD_NEW_ARRAY_SUFFIX = MethodTypeDesc.of(CD_Array_byte, CD_String, CD_int, CD_byte);
- static final MethodTypeDesc MTD_STRING_INIT = MethodTypeDesc.of(CD_void, CD_Array_byte, CD_byte);
-
- static final MethodTypeDesc PREPEND_int = MethodTypeDesc.of(CD_int, CD_int, CD_byte, CD_Array_byte, CD_int, CD_String);
- static final MethodTypeDesc PREPEND_long = MethodTypeDesc.of(CD_int, CD_int, CD_byte, CD_Array_byte, CD_long, CD_String);
- static final MethodTypeDesc PREPEND_boolean = MethodTypeDesc.of(CD_int, CD_int, CD_byte, CD_Array_byte, CD_boolean, CD_String);
- static final MethodTypeDesc PREPEND_char = MethodTypeDesc.of(CD_int, CD_int, CD_byte, CD_Array_byte, CD_char, CD_String);
- static final MethodTypeDesc PREPEND_String = MethodTypeDesc.of(CD_int, CD_int, CD_byte, CD_Array_byte, CD_String, CD_String);
+ static final ClassDesc CD_StringConcatHelper = ReferenceClassDescImpl.ofValidated("Ljava/lang/StringConcatHelper;");
+ static final ClassDesc CD_StringConcatBase = ReferenceClassDescImpl.ofValidated("Ljava/lang/StringConcatHelper$StringConcatBase;");
+ static final ClassDesc CD_Array_byte = ReferenceClassDescImpl.ofValidated("[B");
+ static final ClassDesc CD_Array_String = ReferenceClassDescImpl.ofValidated("[Ljava/lang/String;");
+
+ static final MethodTypeDesc MTD_byte_char = MethodTypeDescImpl.ofValidated(CD_byte, CD_char);
+ static final MethodTypeDesc MTD_byte = MethodTypeDescImpl.ofValidated(CD_byte);
+ static final MethodTypeDesc MTD_int = MethodTypeDescImpl.ofValidated(CD_int);
+ static final MethodTypeDesc MTD_int_int_boolean = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_boolean);
+ static final MethodTypeDesc MTD_int_int_char = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_char);
+ static final MethodTypeDesc MTD_int_int_int = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_int);
+ static final MethodTypeDesc MTD_int_int_long = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_long);
+ static final MethodTypeDesc MTD_int_int_String = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_String);
+ static final MethodTypeDesc MTD_String_float = MethodTypeDescImpl.ofValidated(CD_String, CD_float);
+ static final MethodTypeDesc MTD_String_double = MethodTypeDescImpl.ofValidated(CD_String, CD_double);
+ static final MethodTypeDesc MTD_String_Object = MethodTypeDescImpl.ofValidated(CD_String, CD_Object);
+
+ static final MethodTypeDesc MTD_INIT = MethodTypeDescImpl.ofValidated(CD_void, CD_Array_String);
+ static final MethodTypeDesc MTD_NEW_ARRAY_SUFFIX = MethodTypeDescImpl.ofValidated(CD_Array_byte, CD_String, CD_int, CD_byte);
+ static final MethodTypeDesc MTD_STRING_INIT = MethodTypeDescImpl.ofValidated(CD_void, CD_Array_byte, CD_byte);
+
+ static final MethodTypeDesc PREPEND_int = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_byte, CD_Array_byte, CD_int, CD_String);
+ static final MethodTypeDesc PREPEND_long = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_byte, CD_Array_byte, CD_long, CD_String);
+ static final MethodTypeDesc PREPEND_boolean = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_byte, CD_Array_byte, CD_boolean, CD_String);
+ static final MethodTypeDesc PREPEND_char = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_byte, CD_Array_byte, CD_char, CD_String);
+ static final MethodTypeDesc PREPEND_String = MethodTypeDescImpl.ofValidated(CD_int, CD_int, CD_byte, CD_Array_byte, CD_String, CD_String);
static final RuntimeVisibleAnnotationsAttribute FORCE_INLINE = RuntimeVisibleAnnotationsAttribute.of(Annotation.of(ClassDesc.ofDescriptor("Ljdk/internal/vm/annotation/ForceInline;")));
@@ -1166,7 +1168,7 @@ private static MethodType erasedArgs(MethodType args) {
}
paramTypes[i] = cl;
}
- return changed ? MethodType.methodType(args.returnType(), paramTypes) : args;
+ return changed ? MethodType.methodType(args.returnType(), paramTypes, true) : args;
}
/**
@@ -1191,24 +1193,36 @@ private static MethodTypeDesc prependArgs(MethodType concatArgs) {
var cl = concatArgs.parameterType(i);
paramTypes[i + 4] = needStringOf(cl) ? CD_String : ConstantUtils.classDesc(cl);
}
- return MethodTypeDesc.of(CD_int, paramTypes);
+ return MethodTypeDescImpl.ofValidated(CD_int, paramTypes);
}
/**
- * Construct the MethodType of the coder method,
- * The first parameter is the initialized coder, Only parameter types that can be UTF16 are added.
+ * Construct the MethodType of the coder method. The first parameter is the initialized coder.
+ * Only parameter types which can be UTF16 are added. Returns null if no such parameter exists.
*/
- private static MethodTypeDesc coderArgs(MethodType concatArgs) {
+ private static MethodTypeDesc coderArgsIfMaybeUTF16(MethodType concatArgs) {
int parameterCount = concatArgs.parameterCount();
- List paramTypes = new ArrayList<>();
- paramTypes.add(CD_int); // init coder
+
+ int maybeUTF16Count = 0;
for (int i = 0; i < parameterCount; i++) {
+ if (maybeUTF16(concatArgs.parameterType(i))) {
+ maybeUTF16Count++;
+ }
+ }
+
+ if (maybeUTF16Count == 0) {
+ return null;
+ }
+
+ var paramTypes = new ClassDesc[maybeUTF16Count + 1];
+ paramTypes[0] = CD_int; // init coder
+ for (int i = 0, paramIndex = 1; i < parameterCount; i++) {
var cl = concatArgs.parameterType(i);
if (maybeUTF16(cl)) {
- paramTypes.add(cl == char.class ? CD_char : CD_String);
+ paramTypes[paramIndex++] = cl == char.class ? CD_char : CD_String;
}
}
- return MethodTypeDesc.of(CD_int, paramTypes);
+ return MethodTypeDescImpl.ofValidated(CD_int, paramTypes);
}
/**
@@ -1223,7 +1237,7 @@ private static MethodTypeDesc lengthArgs(MethodType concatArgs) {
var cl = concatArgs.parameterType(i);
paramTypes[i + 1] = needStringOf(cl) ? CD_String : ConstantUtils.classDesc(cl);
}
- return MethodTypeDesc.of(CD_int, paramTypes);
+ return MethodTypeDescImpl.ofValidated(CD_int, paramTypes);
}
private static MethodHandle generate(Lookup lookup, MethodType args, String[] constants) throws Exception {
@@ -1250,7 +1264,7 @@ private static MethodHandle generate(Lookup lookup, MethodType args, String[] co
}
}
MethodTypeDesc lengthArgs = lengthArgs(concatArgs),
- coderArgs = parameterMaybeUTF16(concatArgs) ? coderArgs(concatArgs) : null,
+ coderArgs = coderArgsIfMaybeUTF16(concatArgs),
prependArgs = prependArgs(concatArgs);
byte[] classBytes = ClassFile.of().build(CD_CONCAT,
@@ -1478,7 +1492,7 @@ public void accept(CodeBuilder cb) {
/*
* String[] constants = this.constants;
- * suffix = constants[paranCount];
+ * suffix = constants[paramCount];
* length -= suffix.length();
*/
cb.aload(thisSlot)
@@ -1692,14 +1706,5 @@ static boolean needStringOf(Class cl) {
static boolean maybeUTF16(Class cl) {
return cl == char.class || !cl.isPrimitive();
}
-
- static boolean parameterMaybeUTF16(MethodType args) {
- for (int i = 0; i < args.parameterCount(); i++) {
- if (maybeUTF16(args.parameterType(i))) {
- return true;
- }
- }
- return false;
- }
}
}
diff --git a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
index 43f7339c75a96..bfdb76e2ef1b6 100644
--- a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
+++ b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
@@ -43,13 +43,14 @@
import java.util.Optional;
import java.util.function.BiPredicate;
import java.util.function.Consumer;
-import java.util.stream.Stream;
+
import jdk.internal.access.SharedSecrets;
import java.lang.classfile.ClassFile;
import java.lang.classfile.Label;
import java.lang.classfile.instruction.SwitchCase;
import jdk.internal.constant.ConstantUtils;
+import jdk.internal.constant.MethodTypeDescImpl;
import jdk.internal.constant.ReferenceClassDescImpl;
import jdk.internal.misc.PreviewFeatures;
import jdk.internal.vm.annotation.Stable;
@@ -81,19 +82,27 @@ private SwitchBootstraps() {}
private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
private static final boolean previewEnabled = PreviewFeatures.isEnabled();
+ private static final ClassDesc CD_BiPredicate = ReferenceClassDescImpl.ofValidated("Ljava/util/function/BiPredicate;");
+ private static final ClassDesc CD_Objects = ReferenceClassDescImpl.ofValidated("Ljava/util/Objects;");
- private static final MethodType TYPES_SWITCH_TYPE = MethodType.methodType(int.class,
+ private static final MethodTypeDesc CHECK_INDEX_DESCRIPTOR =
+ MethodTypeDescImpl.ofValidated(ConstantDescs.CD_int, ConstantDescs.CD_int, ConstantDescs.CD_int);
+ private static final MethodTypeDesc MTD_TYPE_SWITCH = MethodTypeDescImpl.ofValidated(ConstantDescs.CD_int,
+ ConstantDescs.CD_Object,
+ ConstantDescs.CD_int);
+ private static final MethodTypeDesc MTD_TYPE_SWITCH_EXTRA = MethodTypeDescImpl.ofValidated(ConstantDescs.CD_int,
+ ConstantDescs.CD_Object,
+ ConstantDescs.CD_int,
+ CD_BiPredicate,
+ ConstantDescs.CD_List);
+ private static final MethodType MT_TYPE_SWITCH_EXTRA = MethodType.methodType(int.class,
Object.class,
int.class,
BiPredicate.class,
List.class);
-
- private static final MethodTypeDesc TYPES_SWITCH_DESCRIPTOR =
- MethodTypeDesc.ofDescriptor("(Ljava/lang/Object;ILjava/util/function/BiPredicate;Ljava/util/List;)I");
- private static final MethodTypeDesc CHECK_INDEX_DESCRIPTOR =
- MethodTypeDesc.ofDescriptor("(II)I");
-
- private static final ClassDesc CD_Objects = ReferenceClassDescImpl.ofValidated("Ljava/util/Objects;");
+ private static final MethodType MT_TYPE_SWITCH = MethodType.methodType(int.class,
+ Object.class,
+ int.class);
private static class StaticHolders {
private static final MethodHandle MAPPED_ENUM_SWITCH;
@@ -180,7 +189,7 @@ public static CallSite typeSwitch(MethodHandles.Lookup lookup,
}
MethodHandle target = generateTypeSwitch(lookup, selectorType, labels);
-
+ target = target.asType(invocationType);
return new ConstantCallSite(target);
}
@@ -272,9 +281,8 @@ public static CallSite enumSwitch(MethodHandles.Lookup lookup,
|| !invocationType.parameterType(0).isEnum()
|| !invocationType.parameterType(1).equals(int.class))
throw new IllegalArgumentException("Illegal invocation type " + invocationType);
- requireNonNull(labels);
- labels = labels.clone();
+ labels = labels.clone(); // implicit null check
Class enumClass = invocationType.parameterType(0);
boolean constantsOnly = true;
@@ -301,7 +309,6 @@ public static CallSite enumSwitch(MethodHandles.Lookup lookup,
} else {
target = generateTypeSwitch(lookup, invocationType.parameterType(0), labels);
}
-
target = target.asType(invocationType);
return new ConstantCallSite(target);
@@ -434,6 +441,33 @@ private static final class MappedEnumCache {
public MethodHandle generatedSwitch;
}
+ /**
+ * Check if the labelConstants can be converted statically to bytecode, or
+ * whether we'll need to compute and pass in extra information at the call site.
+ */
+ private static boolean needsExtraInfo(Class selectorType, Object[] labelConstants) {
+ for (int idx = labelConstants.length - 1; idx >= 0; idx--) {
+ Object currentLabel = labelConstants[idx];
+ if (currentLabel instanceof Class classLabel) {
+ // No extra info needed for exact matches or primitives
+ if (unconditionalExactnessCheck(selectorType, classLabel) || classLabel.isPrimitive()) {
+ continue;
+ }
+ // Hidden classes - or arrays thereof - can't be nominally
+ // represented. Passed in as arguments.
+ while (classLabel.isArray()) {
+ classLabel = classLabel.getComponentType();
+ }
+ if (classLabel.isHidden()) {
+ return true;
+ }
+ } else if (currentLabel instanceof EnumDesc) {
+ // EnumDescs labels needs late binding
+ return true;
+ }
+ }
+ return false;
+ }
/*
* Construct test chains for labels inside switch, to handle switch repeats:
* switch (idx) {
@@ -467,9 +501,10 @@ private static Consumer generateTypeSwitchSkeleton(Class selecto
}
cb.iload(RESTART_IDX);
Label dflt = cb.newLabel();
- record Element(Label target, Label next, Object caseLabel) { }
- List cases = new ArrayList<>();
- List switchCases = new ArrayList<>();
+ Label[] caseTargets = new Label[labelConstants.length];
+ Label[] caseNext = new Label[labelConstants.length];
+ Object[] caseLabels = new Object[labelConstants.length];
+ SwitchCase[] switchCases = new SwitchCase[labelConstants.length];
Object lastLabel = null;
for (int idx = labelConstants.length - 1; idx >= 0; idx--) {
Object currentLabel = labelConstants[idx];
@@ -478,22 +513,22 @@ record Element(Label target, Label next, Object caseLabel) { }
if (lastLabel == null) {
next = dflt;
} else if (lastLabel.equals(currentLabel)) {
- next = cases.getLast().next();
+ next = caseNext[idx + 1];
} else {
- next = cases.getLast().target();
+ next = caseTargets[idx + 1];
}
lastLabel = currentLabel;
- cases.add(new Element(target, next, currentLabel));
- switchCases.add(SwitchCase.of(idx, target));
+ caseTargets[idx] = target;
+ caseNext[idx] = next;
+ caseLabels[idx] = currentLabel;
+ switchCases[idx] = SwitchCase.of(idx, target);
}
- cases = cases.reversed();
- switchCases = switchCases.reversed();
- cb.tableswitch(0, labelConstants.length - 1, dflt, switchCases);
- for (int idx = 0; idx < cases.size(); idx++) {
- Element element = cases.get(idx);
- Label next = element.next();
- cb.labelBinding(element.target());
- if (element.caseLabel() instanceof Class classLabel) {
+ cb.tableswitch(0, labelConstants.length - 1, dflt, Arrays.asList(switchCases));
+ for (int idx = 0; idx < labelConstants.length; idx++) {
+ Label next = caseNext[idx];
+ Object caseLabel = caseLabels[idx];
+ cb.labelBinding(caseTargets[idx]);
+ if (caseLabel instanceof Class classLabel) {
if (unconditionalExactnessCheck(selectorType, classLabel)) {
//nothing - unconditionally use this case
} else if (classLabel.isPrimitive()) {
@@ -577,7 +612,7 @@ record Element(Label target, Label next, Object caseLabel) { }
extraClassLabels.add(classLabel);
}
}
- } else if (element.caseLabel() instanceof EnumDesc enumLabel) {
+ } else if (caseLabel instanceof EnumDesc enumLabel) {
int enumIdx = enumDescs.size();
enumDescs.add(enumLabel);
cb.aload(ENUM_CACHE);
@@ -587,13 +622,13 @@ record Element(Label target, Label next, Object caseLabel) { }
MethodTypeDesc.of(ConstantDescs.CD_Integer,
ConstantDescs.CD_int));
cb.aload(SELECTOR_OBJ);
- cb.invokeinterface(referenceClassDesc(BiPredicate.class),
+ cb.invokeinterface(CD_BiPredicate,
"test",
MethodTypeDesc.of(ConstantDescs.CD_boolean,
ConstantDescs.CD_Object,
ConstantDescs.CD_Object));
cb.ifeq(next);
- } else if (element.caseLabel() instanceof String stringLabel) {
+ } else if (caseLabel instanceof String stringLabel) {
cb.ldc(stringLabel);
cb.aload(SELECTOR_OBJ);
cb.invokevirtual(ConstantDescs.CD_Object,
@@ -601,7 +636,7 @@ record Element(Label target, Label next, Object caseLabel) { }
MethodTypeDesc.of(ConstantDescs.CD_boolean,
ConstantDescs.CD_Object));
cb.ifeq(next);
- } else if (element.caseLabel() instanceof Integer integerLabel) {
+ } else if (caseLabel instanceof Integer integerLabel) {
Label compare = cb.newLabel();
Label notNumber = cb.newLabel();
cb.aload(SELECTOR_OBJ);
@@ -626,16 +661,16 @@ record Element(Label target, Label next, Object caseLabel) { }
cb.ldc(integerLabel);
cb.if_icmpne(next);
- } else if ((element.caseLabel() instanceof Long ||
- element.caseLabel() instanceof Float ||
- element.caseLabel() instanceof Double ||
- element.caseLabel() instanceof Boolean)) {
- if (element.caseLabel() instanceof Boolean c) {
+ } else if ((caseLabel instanceof Long ||
+ caseLabel instanceof Float ||
+ caseLabel instanceof Double ||
+ caseLabel instanceof Boolean)) {
+ if (caseLabel instanceof Boolean c) {
cb.loadConstant(c ? 1 : 0);
} else {
- cb.loadConstant((ConstantDesc) element.caseLabel());
+ cb.loadConstant((ConstantDesc) caseLabel);
}
- var caseLabelWrapper = Wrapper.forWrapperType(element.caseLabel().getClass());
+ var caseLabelWrapper = Wrapper.forWrapperType(caseLabel.getClass());
cb.invokestatic(caseLabelWrapper.wrapperClassDescriptor(),
"valueOf",
MethodTypeDesc.of(caseLabelWrapper.wrapperClassDescriptor(),
@@ -648,13 +683,13 @@ record Element(Label target, Label next, Object caseLabel) { }
cb.ifeq(next);
} else {
throw new InternalError("Unsupported label type: " +
- element.caseLabel().getClass());
+ caseLabel.getClass());
}
cb.loadConstant(idx);
cb.ireturn();
}
cb.labelBinding(dflt);
- cb.loadConstant(cases.size());
+ cb.loadConstant(labelConstants.length);
cb.ireturn();
};
}
@@ -663,14 +698,15 @@ record Element(Label target, Label next, Object caseLabel) { }
* Construct the method handle that represents the method int typeSwitch(Object, int, BiPredicate, List)
*/
private static MethodHandle generateTypeSwitch(MethodHandles.Lookup caller, Class selectorType, Object[] labelConstants) {
- List> enumDescs = new ArrayList<>();
- List> extraClassLabels = new ArrayList<>();
+ boolean addExtraInfo = needsExtraInfo(selectorType, labelConstants);
+ List> enumDescs = addExtraInfo ? new ArrayList<>() : null;
+ List> extraClassLabels = addExtraInfo ? new ArrayList<>() : null;
byte[] classBytes = ClassFile.of().build(ConstantUtils.binaryNameToDesc(typeSwitchClassName(caller.lookupClass())),
clb -> {
clb.withFlags(AccessFlag.FINAL, AccessFlag.SUPER, AccessFlag.SYNTHETIC)
.withMethodBody("typeSwitch",
- TYPES_SWITCH_DESCRIPTOR,
+ addExtraInfo ? MTD_TYPE_SWITCH_EXTRA : MTD_TYPE_SWITCH,
ClassFile.ACC_FINAL | ClassFile.ACC_PUBLIC | ClassFile.ACC_STATIC,
generateTypeSwitchSkeleton(selectorType, labelConstants, enumDescs, extraClassLabels));
});
@@ -681,13 +717,11 @@ private static MethodHandle generateTypeSwitch(MethodHandles.Lookup caller, Clas
lookup = caller.defineHiddenClass(classBytes, true, NESTMATE, STRONG);
MethodHandle typeSwitch = lookup.findStatic(lookup.lookupClass(),
"typeSwitch",
- TYPES_SWITCH_TYPE);
- typeSwitch = MethodHandles.insertArguments(typeSwitch, 2, new ResolvedEnumLabels(caller, enumDescs.toArray(new EnumDesc[0])),
- List.copyOf(extraClassLabels));
- typeSwitch = MethodHandles.explicitCastArguments(typeSwitch,
- MethodType.methodType(int.class,
- selectorType,
- int.class));
+ addExtraInfo ? MT_TYPE_SWITCH_EXTRA : MT_TYPE_SWITCH);
+ if (addExtraInfo) {
+ typeSwitch = MethodHandles.insertArguments(typeSwitch, 2, new ResolvedEnumLabels(caller, enumDescs.toArray(new EnumDesc[0])),
+ List.copyOf(extraClassLabels));
+ }
return typeSwitch;
} catch (Throwable t) {
throw new IllegalArgumentException(t);
diff --git a/src/java.base/share/classes/java/text/CompactNumberFormat.java b/src/java.base/share/classes/java/text/CompactNumberFormat.java
index 0cb5eb88079e4..35464d6ec91d0 100644
--- a/src/java.base/share/classes/java/text/CompactNumberFormat.java
+++ b/src/java.base/share/classes/java/text/CompactNumberFormat.java
@@ -652,16 +652,16 @@ private StringBuf format(double number, StringBuf result,
double val = getNumberValue(number, divisor);
if (checkIncrement(val, compactDataIndex, divisor)) {
divisor = (Long) divisors.get(++compactDataIndex);
- val = getNumberValue(number, divisor);
}
+ roundedNumber = roundedNumber / divisor;
+ decimalFormat.setDigitList(roundedNumber, isNegative, getMaximumFractionDigits());
+ val = decimalFormat.getDigitList().getDouble();
String prefix = getAffix(false, true, isNegative, compactDataIndex, val);
String suffix = getAffix(false, false, isNegative, compactDataIndex, val);
if (!prefix.isEmpty() || !suffix.isEmpty()) {
appendPrefix(result, prefix, delegate);
if (!placeHolderPatterns.get(compactDataIndex).get(val).isEmpty()) {
- roundedNumber = roundedNumber / divisor;
- decimalFormat.setDigitList(roundedNumber, isNegative, getMaximumFractionDigits());
decimalFormat.subformatNumber(result, delegate, isNegative,
false, getMaximumIntegerDigits(), getMinimumIntegerDigits(),
getMaximumFractionDigits(), getMinimumFractionDigits());
@@ -734,31 +734,28 @@ private StringBuf format(long number, StringBuf result, FieldDelegate delegate)
double val = getNumberValue(number, divisor);
if (checkIncrement(val, compactDataIndex, divisor)) {
divisor = (Long) divisors.get(++compactDataIndex);
- val = getNumberValue(number, divisor);
}
+ var noFraction = number % divisor == 0;
+ if (noFraction) {
+ number = number / divisor;
+ decimalFormat.setDigitList(number, isNegative, 0);
+ } else {
+ // To avoid truncation of fractional part store
+ // the value in double and follow double path instead of
+ // long path
+ double dNumber = (double) number / divisor;
+ decimalFormat.setDigitList(dNumber, isNegative, getMaximumFractionDigits());
+ }
+ val = decimalFormat.getDigitList().getDouble();
String prefix = getAffix(false, true, isNegative, compactDataIndex, val);
String suffix = getAffix(false, false, isNegative, compactDataIndex, val);
if (!prefix.isEmpty() || !suffix.isEmpty()) {
appendPrefix(result, prefix, delegate);
if (!placeHolderPatterns.get(compactDataIndex).get(val).isEmpty()) {
- if ((number % divisor == 0)) {
- number = number / divisor;
- decimalFormat.setDigitList(number, isNegative, 0);
- decimalFormat.subformatNumber(result, delegate,
- isNegative, true, getMaximumIntegerDigits(),
- getMinimumIntegerDigits(), getMaximumFractionDigits(),
- getMinimumFractionDigits());
- } else {
- // To avoid truncation of fractional part store
- // the value in double and follow double path instead of
- // long path
- double dNumber = (double) number / divisor;
- decimalFormat.setDigitList(dNumber, isNegative, getMaximumFractionDigits());
- decimalFormat.subformatNumber(result, delegate,
- isNegative, false, getMaximumIntegerDigits(),
- getMinimumIntegerDigits(), getMaximumFractionDigits(),
- getMinimumFractionDigits());
- }
+ decimalFormat.subformatNumber(result, delegate,
+ isNegative, noFraction, getMaximumIntegerDigits(),
+ getMinimumIntegerDigits(), getMaximumFractionDigits(),
+ getMinimumFractionDigits());
appendSuffix(result, suffix, delegate);
}
} else {
@@ -833,15 +830,15 @@ private StringBuf format(BigDecimal number, StringBuf result,
double val = getNumberValue(number.doubleValue(), divisor.doubleValue());
if (checkIncrement(val, compactDataIndex, divisor.doubleValue())) {
divisor = divisors.get(++compactDataIndex);
- val = getNumberValue(number.doubleValue(), divisor.doubleValue());
}
+ number = number.divide(new BigDecimal(divisor.toString()), getRoundingMode());
+ decimalFormat.setDigitList(number, isNegative, getMaximumFractionDigits());
+ val = decimalFormat.getDigitList().getDouble();
String prefix = getAffix(false, true, isNegative, compactDataIndex, val);
String suffix = getAffix(false, false, isNegative, compactDataIndex, val);
if (!prefix.isEmpty() || !suffix.isEmpty()) {
appendPrefix(result, prefix, delegate);
if (!placeHolderPatterns.get(compactDataIndex).get(val).isEmpty()) {
- number = number.divide(new BigDecimal(divisor.toString()), getRoundingMode());
- decimalFormat.setDigitList(number, isNegative, getMaximumFractionDigits());
decimalFormat.subformatNumber(result, delegate, isNegative,
false, getMaximumIntegerDigits(), getMinimumIntegerDigits(),
getMaximumFractionDigits(), getMinimumFractionDigits());
@@ -904,34 +901,30 @@ private StringBuf format(BigInteger number, StringBuf result,
double val = getNumberValue(number.doubleValue(), divisor.doubleValue());
if (checkIncrement(val, compactDataIndex, divisor.doubleValue())) {
divisor = divisors.get(++compactDataIndex);
- val = getNumberValue(number.doubleValue(), divisor.doubleValue());
}
+ var noFraction = number.mod(new BigInteger(divisor.toString()))
+ .compareTo(BigInteger.ZERO) == 0;
+ if (noFraction) {
+ number = number.divide(new BigInteger(divisor.toString()));
+ decimalFormat.setDigitList(number, isNegative, 0);
+ } else {
+ // To avoid truncation of fractional part store the value in
+ // BigDecimal and follow BigDecimal path instead of
+ // BigInteger path
+ BigDecimal nDecimal = new BigDecimal(number)
+ .divide(new BigDecimal(divisor.toString()), getRoundingMode());
+ decimalFormat.setDigitList(nDecimal, isNegative, getMaximumFractionDigits());
+ }
+ val = decimalFormat.getDigitList().getDouble();
String prefix = getAffix(false, true, isNegative, compactDataIndex, val);
String suffix = getAffix(false, false, isNegative, compactDataIndex, val);
if (!prefix.isEmpty() || !suffix.isEmpty()) {
appendPrefix(result, prefix, delegate);
if (!placeHolderPatterns.get(compactDataIndex).get(val).isEmpty()) {
- if (number.mod(new BigInteger(divisor.toString()))
- .compareTo(BigInteger.ZERO) == 0) {
- number = number.divide(new BigInteger(divisor.toString()));
-
- decimalFormat.setDigitList(number, isNegative, 0);
- decimalFormat.subformatNumber(result, delegate,
- isNegative, true, getMaximumIntegerDigits(),
- getMinimumIntegerDigits(), getMaximumFractionDigits(),
- getMinimumFractionDigits());
- } else {
- // To avoid truncation of fractional part store the value in
- // BigDecimal and follow BigDecimal path instead of
- // BigInteger path
- BigDecimal nDecimal = new BigDecimal(number)
- .divide(new BigDecimal(divisor.toString()), getRoundingMode());
- decimalFormat.setDigitList(nDecimal, isNegative, getMaximumFractionDigits());
- decimalFormat.subformatNumber(result, delegate,
- isNegative, false, getMaximumIntegerDigits(),
- getMinimumIntegerDigits(), getMaximumFractionDigits(),
- getMinimumFractionDigits());
- }
+ decimalFormat.subformatNumber(result, delegate,
+ isNegative, noFraction, getMaximumIntegerDigits(),
+ getMinimumIntegerDigits(), getMaximumFractionDigits(),
+ getMinimumFractionDigits());
appendSuffix(result, suffix, delegate);
}
} else {
diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index c04abbd042f57..b23c5f360bf05 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -1799,6 +1799,14 @@ void setDigitList(Number number, boolean isNegative, int maxDigits) {
}
}
+ /**
+ * {@return the {@code DigitList} used by this {@code DecimalFormat} instance}
+ * Declared as package-private, intended for {@code CompactNumberFormat}.
+ */
+ DigitList getDigitList() {
+ return digitList;
+ }
+
// ======== End fast-path formatting logic for double =========================
/**
diff --git a/src/java.base/share/classes/java/time/LocalDateTime.java b/src/java.base/share/classes/java/time/LocalDateTime.java
index d14afb7d78f9a..cea9123258c6b 100644
--- a/src/java.base/share/classes/java/time/LocalDateTime.java
+++ b/src/java.base/share/classes/java/time/LocalDateTime.java
@@ -1966,10 +1966,17 @@ public int hashCode() {
@Override
public String toString() {
var buf = new StringBuilder(29);
+ formatTo(buf);
+ return buf.toString();
+ }
+
+ /**
+ * Prints the toString result to the given buf, avoiding extra string allocations.
+ */
+ void formatTo(StringBuilder buf) {
date.formatTo(buf);
buf.append('T');
time.formatTo(buf);
- return buf.toString();
}
//-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/OffsetDateTime.java b/src/java.base/share/classes/java/time/OffsetDateTime.java
index bd75fffb24e55..fd8355e36cda5 100644
--- a/src/java.base/share/classes/java/time/OffsetDateTime.java
+++ b/src/java.base/share/classes/java/time/OffsetDateTime.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -1923,7 +1923,10 @@ public int hashCode() {
*/
@Override
public String toString() {
- return dateTime.toString() + offset.toString();
+ var offsetStr = offset.toString();
+ var buf = new StringBuilder(29 + offsetStr.length());
+ dateTime.formatTo(buf);
+ return buf.append(offsetStr).toString();
}
//-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/OffsetTime.java b/src/java.base/share/classes/java/time/OffsetTime.java
index b9fe5e533d80e..1f6feb4180fc5 100644
--- a/src/java.base/share/classes/java/time/OffsetTime.java
+++ b/src/java.base/share/classes/java/time/OffsetTime.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -1398,7 +1398,10 @@ public int hashCode() {
*/
@Override
public String toString() {
- return time.toString() + offset.toString();
+ var offsetStr = offset.toString();
+ var buf = new StringBuilder(18 + offsetStr.length());
+ time.formatTo(buf);
+ return buf.append(offsetStr).toString();
}
//-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/ZonedDateTime.java b/src/java.base/share/classes/java/time/ZonedDateTime.java
index 555392cf513ce..b1426efc914a4 100644
--- a/src/java.base/share/classes/java/time/ZonedDateTime.java
+++ b/src/java.base/share/classes/java/time/ZonedDateTime.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -2214,11 +2214,20 @@ public int hashCode() {
*/
@Override // override for Javadoc
public String toString() {
- String str = dateTime.toString() + offset.toString();
+ var offsetStr = offset.toString();
+ var zoneStr = (String) null;
+ int length = 29 + offsetStr.length();
if (offset != zone) {
- str += '[' + zone.toString() + ']';
+ zoneStr = zone.toString();
+ length += zoneStr.length() + 2;
}
- return str;
+ var buf = new StringBuilder(length);
+ dateTime.formatTo(buf);
+ buf.append(offsetStr);
+ if (zoneStr != null) {
+ buf.append('[').append(zoneStr).append(']');
+ }
+ return buf.toString();
}
//-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index ae6c4af5ec56c..73132b81c09a6 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -988,17 +988,23 @@ static Locale getInstance(BaseLocale baseloc, LocaleExtensions extensions) {
if (locale != null) {
return locale;
}
- return LOCALE_CACHE.computeIfAbsent(baseloc, LOCALE_CREATOR);
+ return LocaleCache.cache(baseloc);
} else {
LocaleKey key = new LocaleKey(baseloc, extensions);
- return LOCALE_CACHE.computeIfAbsent(key, LOCALE_CREATOR);
+ return LocaleCache.cache(key);
}
}
- private static final ReferencedKeyMap LOCALE_CACHE
- = ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier());
+ private static final class LocaleCache implements Function {
+ private static final ReferencedKeyMap LOCALE_CACHE
+ = ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier());
+
+ private static final Function LOCALE_CREATOR = new LocaleCache();
+
+ public static Locale cache(Object key) {
+ return LOCALE_CACHE.computeIfAbsent(key, LOCALE_CREATOR);
+ }
- private static final Function LOCALE_CREATOR = new Function<>() {
@Override
public Locale apply(Object key) {
if (key instanceof BaseLocale base) {
@@ -1007,7 +1013,7 @@ public Locale apply(Object key) {
LocaleKey lk = (LocaleKey)key;
return new Locale(lk.base, lk.exts);
}
- };
+ }
private static final class LocaleKey {
diff --git a/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java b/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
index 87e2ea4920599..d2bfa40c9b9d0 100644
--- a/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
+++ b/src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
@@ -182,6 +182,11 @@ public class ScheduledThreadPoolExecutor
*/
private static final AtomicLong sequencer = new AtomicLong();
+ /**
+ * Maximum delay is effectively 146 years
+ */
+ private static final long MAX_NANOS = (Long.MAX_VALUE >>> 1) - 1;
+
private class ScheduledFutureTask
extends FutureTask implements RunnableScheduledFuture {
@@ -525,25 +530,7 @@ private long triggerTime(long delay, TimeUnit unit) {
* Returns the nanoTime-based trigger time of a delayed action.
*/
long triggerTime(long delay) {
- return System.nanoTime() +
- ((delay < (Long.MAX_VALUE >> 1)) ? delay : overflowFree(delay));
- }
-
- /**
- * Constrains the values of all delays in the queue to be within
- * Long.MAX_VALUE of each other, to avoid overflow in compareTo.
- * This may occur if a task is eligible to be dequeued, but has
- * not yet been, while some other task is added with a delay of
- * Long.MAX_VALUE.
- */
- private long overflowFree(long delay) {
- Delayed head = (Delayed) super.getQueue().peek();
- if (head != null) {
- long headDelay = head.getDelay(NANOSECONDS);
- if (headDelay < 0 && (delay - headDelay < 0))
- delay = Long.MAX_VALUE + headDelay;
- }
- return delay;
+ return System.nanoTime() + Math.min(delay, MAX_NANOS);
}
/**
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index e4d322a20d729..2a89386f742dc 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -281,10 +281,14 @@ public interface JavaLangAccess {
void addEnableNativeAccessToAllUnnamed();
/**
- * Ensure that the given module has native access. If not, warn or
- * throw exception depending on the configuration.
- */
- void ensureNativeAccess(Module m, Class owner, String methodName, Class currentClass);
+ * Ensure that the given module has native access. If not, warn or throw exception depending on the configuration.
+ * @param m the module in which native access occurred
+ * @param owner the owner of the restricted method being called (or the JNI method being bound)
+ * @param methodName the name of the restricted method being called (or the JNI method being bound)
+ * @param currentClass the class calling the restricted method (for JNI, this is the same as {@code owner})
+ * @param jni {@code true}, if this event is related to a JNI method being bound
+ */
+ void ensureNativeAccess(Module m, Class owner, String methodName, Class currentClass, boolean jni);
/**
* Returns the ServicesCatalog for the given Layer.
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index c27968eecab4f..bc885291b44cd 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -1030,34 +1030,13 @@ public boolean equals(Object o) {
}
- abstract static sealed class PrimitiveEntry
- extends AbstractPoolEntry {
- protected final T val;
-
- public PrimitiveEntry(ConstantPool constantPool, int tag, int index, T val) {
- super(constantPool, tag, index, hash1(tag, val.hashCode()));
- this.val = val;
- }
+ public static final class IntegerEntryImpl extends AbstractPoolEntry implements IntegerEntry {
- public T value() {
- return val;
- }
-
- public ConstantDesc constantValue() {
- return value();
- }
-
- @Override
- public String toString() {
- return "" + tag() + value();
- }
- }
-
- public static final class IntegerEntryImpl extends PrimitiveEntry
- implements IntegerEntry {
+ private final int val;
IntegerEntryImpl(ConstantPool cpm, int index, int i) {
- super(cpm, ClassFile.TAG_INTEGER, index, i);
+ super(cpm, ClassFile.TAG_INTEGER, index, hash1(ClassFile.TAG_INTEGER, Integer.hashCode(i)));
+ val = i;
}
@Override
@@ -1073,7 +1052,12 @@ public IntegerEntry clone(ConstantPoolBuilder cp) {
@Override
public int intValue() {
- return value();
+ return val;
+ }
+
+ @Override
+ public ConstantDesc constantValue() {
+ return val;
}
@Override
@@ -1086,11 +1070,14 @@ public boolean equals(Object o) {
}
}
- public static final class FloatEntryImpl extends PrimitiveEntry
+ public static final class FloatEntryImpl extends AbstractPoolEntry
implements FloatEntry {
+ private final float val;
+
FloatEntryImpl(ConstantPool cpm, int index, float f) {
- super(cpm, ClassFile.TAG_FLOAT, index, f);
+ super(cpm, ClassFile.TAG_FLOAT, index, hash1(ClassFile.TAG_FLOAT, Float.hashCode(f)));
+ val = f;
}
@Override
@@ -1106,7 +1093,12 @@ public FloatEntry clone(ConstantPoolBuilder cp) {
@Override
public float floatValue() {
- return value();
+ return val;
+ }
+
+ @Override
+ public ConstantDesc constantValue() {
+ return val;
}
@Override
@@ -1119,10 +1111,13 @@ public boolean equals(Object o) {
}
}
- public static final class LongEntryImpl extends PrimitiveEntry implements LongEntry {
+ public static final class LongEntryImpl extends AbstractPoolEntry implements LongEntry {
+
+ private final long val;
LongEntryImpl(ConstantPool cpm, int index, long l) {
- super(cpm, ClassFile.TAG_LONG, index, l);
+ super(cpm, ClassFile.TAG_LONG, index, hash1(ClassFile.TAG_LONG, Long.hashCode(l)));
+ val = l;
}
@Override
@@ -1138,7 +1133,12 @@ public LongEntry clone(ConstantPoolBuilder cp) {
@Override
public long longValue() {
- return value();
+ return val;
+ }
+
+ @Override
+ public ConstantDesc constantValue() {
+ return val;
}
@Override
@@ -1151,10 +1151,13 @@ public boolean equals(Object o) {
}
}
- public static final class DoubleEntryImpl extends PrimitiveEntry implements DoubleEntry {
+ public static final class DoubleEntryImpl extends AbstractPoolEntry implements DoubleEntry {
+
+ private final double val;
DoubleEntryImpl(ConstantPool cpm, int index, double d) {
- super(cpm, ClassFile.TAG_DOUBLE, index, d);
+ super(cpm, ClassFile.TAG_DOUBLE, index, hash1(ClassFile.TAG_DOUBLE, Double.hashCode(d)));
+ val = d;
}
@Override
@@ -1170,7 +1173,12 @@ public DoubleEntry clone(ConstantPoolBuilder cp) {
@Override
public double doubleValue() {
- return value();
+ return val;
+ }
+
+ @Override
+ public ConstantDesc constantValue() {
+ return val;
}
@Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java
index 31e1a7f2533fc..fb9ecc98902d7 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java
@@ -54,7 +54,7 @@ public void writeTo(BufWriterImpl buf) {
}
@SuppressWarnings("unchecked")
- A get(AttributeMapper am) {
+ > A get(AttributeMapper am) {
for (Attribute a : attributes)
if (a.attributeMapper() == am)
return (A)a;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
index d5ed0c14bcef4..36ef2fa55ebef 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -148,7 +148,7 @@ public static List> readAttributes(AttributedElement enclosing, Cla
mapper = customAttributes.apply(name);
}
if (mapper != null) {
- filled.add((Attribute) Objects.requireNonNull(mapper.readAttribute(enclosing, reader, p)));
+ filled.add(Objects.requireNonNull(mapper.readAttribute(enclosing, reader, p)));
} else {
AttributeMapper fakeMapper = new AttributeMapper<>() {
@Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
index 8de62e7a12ba6..1fd4c5cb1a0b0 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 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
@@ -83,17 +83,28 @@ public ClassFileImpl withOptions(Option... options) {
var chro = classHierarchyResolverOption;
var amo = attributeMapperOption;
for (var o : options) {
- switch (o) {
- case StackMapsOption oo -> smo = oo;
- case DebugElementsOption oo -> deo = oo;
- case LineNumbersOption oo -> lno = oo;
- case AttributesProcessingOption oo -> apo = oo;
- case ConstantPoolSharingOption oo -> cpso = oo;
- case ShortJumpsOption oo -> sjo = oo;
- case DeadCodeOption oo -> dco = oo;
- case DeadLabelsOption oo -> dlo = oo;
- case ClassHierarchyResolverOption oo -> chro = oo;
- case AttributeMapperOption oo -> amo = oo;
+ if (o instanceof StackMapsOption oo) {
+ smo = oo;
+ } else if (o instanceof DebugElementsOption oo) {
+ deo = oo;
+ } else if (o instanceof LineNumbersOption oo) {
+ lno = oo;
+ } else if (o instanceof AttributesProcessingOption oo) {
+ apo = oo;
+ } else if (o instanceof ConstantPoolSharingOption oo) {
+ cpso = oo;
+ } else if (o instanceof ShortJumpsOption oo) {
+ sjo = oo;
+ } else if (o instanceof DeadCodeOption oo) {
+ dco = oo;
+ } else if (o instanceof DeadLabelsOption oo) {
+ dlo = oo;
+ } else if (o instanceof ClassHierarchyResolverOption oo) {
+ chro = oo;
+ } else if (o instanceof AttributeMapperOption oo) {
+ amo = oo;
+ } else { // null or unknown Option type
+ throw new IllegalArgumentException("Invalid option: " + o);
}
}
return new ClassFileImpl(smo, deo, lno, apo, cpso, sjo, dco, dlo, chro, amo);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
index f7905712b18d6..777da61c49d9d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
@@ -266,19 +266,70 @@ private BootstrapMethodEntryImpl internalAdd(BootstrapMethodEntryImpl bsm, int h
return bsm;
}
- private PoolEntry findPrimitiveEntry(int tag, T val) {
- int hash = AbstractPoolEntry.hash1(tag, val.hashCode());
+ private IntegerEntry findIntEntry(int val) {
+ int hash = AbstractPoolEntry.hash1(TAG_INTEGER, Integer.hashCode(val));
EntryMap map = map();
for (int token = map.firstToken(hash); token != -1; token = map.nextToken(hash, token)) {
PoolEntry e = map.getElementByToken(token);
- if (e.tag() == tag
- && e instanceof AbstractPoolEntry.PrimitiveEntry ce
- && ce.value().equals(val))
- return e;
+ if (e.tag() == TAG_INTEGER
+ && e instanceof AbstractPoolEntry.IntegerEntryImpl ce
+ && ce.intValue() == val)
+ return ce;
+ }
+ if (!doneFullScan) {
+ fullScan();
+ return findIntEntry(val);
+ }
+ return null;
+ }
+
+ private LongEntry findLongEntry(long val) {
+ int hash = AbstractPoolEntry.hash1(TAG_LONG, Long.hashCode(val));
+ EntryMap map = map();
+ for (int token = map.firstToken(hash); token != -1; token = map.nextToken(hash, token)) {
+ PoolEntry e = map.getElementByToken(token);
+ if (e.tag() == TAG_LONG
+ && e instanceof AbstractPoolEntry.LongEntryImpl ce
+ && ce.longValue() == val)
+ return ce;
+ }
+ if (!doneFullScan) {
+ fullScan();
+ return findLongEntry(val);
+ }
+ return null;
+ }
+
+ private FloatEntry findFloatEntry(float val) {
+ int hash = AbstractPoolEntry.hash1(TAG_FLOAT, Float.hashCode(val));
+ EntryMap map = map();
+ for (int token = map.firstToken(hash); token != -1; token = map.nextToken(hash, token)) {
+ PoolEntry e = map.getElementByToken(token);
+ if (e.tag() == TAG_FLOAT
+ && e instanceof AbstractPoolEntry.FloatEntryImpl ce
+ && ce.floatValue() == val)
+ return ce;
+ }
+ if (!doneFullScan) {
+ fullScan();
+ return findFloatEntry(val);
+ }
+ return null;
+ }
+
+ private DoubleEntry findDoubleEntry(double val) {
+ int hash = AbstractPoolEntry.hash1(TAG_DOUBLE, Double.hashCode(val));
+ EntryMap map = map();
+ for (int token = map.firstToken(hash); token != -1; token = map.nextToken(hash, token)) {
+ PoolEntry e = map.getElementByToken(token);
+ if (e.tag() == TAG_DOUBLE
+ && e instanceof AbstractPoolEntry.DoubleEntryImpl ce
+ && ce.doubleValue() == val)
+ return ce;
}
if (!doneFullScan) {
fullScan();
- return findPrimitiveEntry(tag, val);
+ return findDoubleEntry(val);
}
return null;
}
@@ -542,25 +593,25 @@ public ConstantDynamicEntry constantDynamicEntry(BootstrapMethodEntry bootstrapM
@Override
public IntegerEntry intEntry(int value) {
- var e = (IntegerEntry) findPrimitiveEntry(TAG_INTEGER, value);
+ var e = findIntEntry(value);
return e == null ? internalAdd(new AbstractPoolEntry.IntegerEntryImpl(this, size, value)) : e;
}
@Override
public FloatEntry floatEntry(float value) {
- var e = (FloatEntry) findPrimitiveEntry(TAG_FLOAT, value);
+ var e = findFloatEntry(value);
return e == null ? internalAdd(new AbstractPoolEntry.FloatEntryImpl(this, size, value)) : e;
}
@Override
public LongEntry longEntry(long value) {
- var e = (LongEntry) findPrimitiveEntry(TAG_LONG, value);
+ var e = findLongEntry(value);
return e == null ? internalAdd(new AbstractPoolEntry.LongEntryImpl(this, size, value)) : e;
}
@Override
public DoubleEntry doubleEntry(double value) {
- var e = (DoubleEntry) findPrimitiveEntry(TAG_DOUBLE, value);
+ var e = findDoubleEntry(value);
return e == null ? internalAdd(new AbstractPoolEntry.DoubleEntryImpl(this, size, value)) : e;
}
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java
index d0bf91171acfe..609333048d0d3 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java
@@ -161,13 +161,14 @@ private static boolean equals(List l1, List
+ switch (vti.tag()) {
+ case VT_TOP, VT_INTEGER, VT_FLOAT, VT_DOUBLE, VT_LONG, VT_NULL, VT_UNINITIALIZED_THIS ->
{}
- case ObjectVerificationTypeInfo ovti ->
- bw.writeIndex(ovti.className());
- case UninitializedVerificationTypeInfo uvti ->
- bw.writeU2(bw.labelContext().labelToBci(uvti.newTarget()));
+ case VT_OBJECT ->
+ bw.writeIndex(((ObjectVerificationTypeInfo)vti).className());
+ case VT_UNINITIALIZED ->
+ bw.writeU2(bw.labelContext().labelToBci(((UninitializedVerificationTypeInfo)vti).newTarget()));
+ default -> throw new IllegalArgumentException("Invalid verification type tag: " + vti.tag());
}
}
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
index 1ff80d766766e..a064c40be30a9 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
@@ -224,7 +224,7 @@ public static MethodTypeDesc methodTypeSymbol(NameAndTypeEntry nat) {
}
@SuppressWarnings("unchecked")
- private static void writeAttribute(BufWriterImpl writer, Attribute attr) {
+ private static > void writeAttribute(BufWriterImpl writer, Attribute attr) {
if (attr instanceof CustomAttribute ca) {
var mapper = (AttributeMapper) ca.attributeMapper();
mapper.writeAttribute(writer, (T) ca);
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 42857decf63b1..75be22ac454fa 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
@@ -152,7 +152,7 @@ public final MemorySegment reinterpret(Arena arena, Consumer clea
}
public MemorySegment reinterpretInternal(Class callerClass, long newSize, Scope scope, Consumer cleanup) {
- Reflection.ensureNativeAccess(callerClass, MemorySegment.class, "reinterpret");
+ Reflection.ensureNativeAccess(callerClass, MemorySegment.class, "reinterpret", false);
Utils.checkNonNegativeArgument(newSize, "newSize");
if (!isNative()) throw new UnsupportedOperationException("Not a native segment");
Runnable action = cleanup != null ?
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 956a5c75875ab..dc995589472b1 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
@@ -66,7 +66,7 @@ public class LayoutPath {
private static final MethodHandle MH_SLICE_LAYOUT;
private static final MethodHandle MH_CHECK_ENCL_LAYOUT;
private static final MethodHandle MH_SEGMENT_RESIZE;
- private static final MethodHandle MH_ADD;
+ private static final MethodHandle MH_ADD_EXACT;
static {
try {
@@ -81,7 +81,7 @@ public class LayoutPath {
MethodType.methodType(void.class, MemorySegment.class, long.class, MemoryLayout.class));
MH_SEGMENT_RESIZE = lookup.findStatic(LayoutPath.class, "resizeSegment",
MethodType.methodType(MemorySegment.class, MemorySegment.class));
- MH_ADD = lookup.findStatic(Long.class, "sum",
+ MH_ADD_EXACT = lookup.findStatic(Math.class, "addExact",
MethodType.methodType(long.class, long.class, long.class));
} catch (Throwable ex) {
throw new ExceptionInInitializerError(ex);
@@ -244,15 +244,18 @@ private static long addScaledOffset(long base, long index, long stride, long bou
}
public MethodHandle offsetHandle() {
- MethodHandle mh = MethodHandles.insertArguments(MH_ADD, 0, offset);
+ MethodHandle mh = MH_ADD_EXACT;
for (int i = strides.length - 1; i >= 0; i--) {
MethodHandle collector = MethodHandles.insertArguments(MH_ADD_SCALED_OFFSET, 2, strides[i], bounds[i]);
- // (J, ...) -> J to (J, J, ...) -> J
- // i.e. new coord is prefixed. Last coord will correspond to innermost layout
- mh = MethodHandles.collectArguments(mh, 0, collector);
- }
-
- return mh;
+ // (J, J, ...) -> J to (J, J, J, ...) -> J
+ // 1. the leading argument is the base offset (externally provided).
+ // 2. index arguments are added. The last index correspond to the innermost layout.
+ // 3. overflow can only occur at the outermost layer, due to the final addition with the base offset.
+ // This is because the layout API ensures (by construction) that all offsets generated from layout paths
+ // are always < Long.MAX_VALUE.
+ mh = MethodHandles.collectArguments(mh, 1, collector);
+ }
+ return MethodHandles.insertArguments(mh, 1, offset);
}
private MemoryLayout rootLayout() {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
index c803a2c9c84b7..103572072ac0c 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
@@ -88,7 +88,7 @@ private record LinkRequest(FunctionDescriptor descriptor, LinkerOptions options)
@Override
@CallerSensitive
public final MethodHandle downcallHandle(MemorySegment symbol, FunctionDescriptor function, Option... options) {
- Reflection.ensureNativeAccess(Reflection.getCallerClass(), Linker.class, "downcallHandle");
+ Reflection.ensureNativeAccess(Reflection.getCallerClass(), Linker.class, "downcallHandle", false);
SharedUtils.checkSymbol(symbol);
return downcallHandle0(function, options).bindTo(symbol);
}
@@ -96,7 +96,7 @@ public final MethodHandle downcallHandle(MemorySegment symbol, FunctionDescripto
@Override
@CallerSensitive
public final MethodHandle downcallHandle(FunctionDescriptor function, Option... options) {
- Reflection.ensureNativeAccess(Reflection.getCallerClass(), Linker.class, "downcallHandle");
+ Reflection.ensureNativeAccess(Reflection.getCallerClass(), Linker.class, "downcallHandle", false);
return downcallHandle0(function, options);
}
@@ -123,7 +123,7 @@ private MethodHandle downcallHandle0(FunctionDescriptor function, Option... opti
@Override
@CallerSensitive
public final MemorySegment upcallStub(MethodHandle target, FunctionDescriptor function, Arena arena, Linker.Option... options) {
- Reflection.ensureNativeAccess(Reflection.getCallerClass(), Linker.class, "upcallStub");
+ Reflection.ensureNativeAccess(Reflection.getCallerClass(), Linker.class, "upcallStub", false);
Objects.requireNonNull(arena);
Objects.requireNonNull(target);
Objects.requireNonNull(function);
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java
index 58d6baf852554..19682d6c43f5b 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/LibFallback.java
@@ -36,7 +36,7 @@ private LibFallback() {}
static final boolean SUPPORTED = tryLoadLibrary();
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
private static boolean tryLoadLibrary() {
return java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<>() {
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 4d19879b01acd..e546773c42903 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
@@ -332,7 +332,7 @@ public int hashCode() {
@Override
@CallerSensitive
public AddressLayout withTargetLayout(MemoryLayout layout) {
- Reflection.ensureNativeAccess(Reflection.getCallerClass(), AddressLayout.class, "withTargetLayout");
+ Reflection.ensureNativeAccess(Reflection.getCallerClass(), AddressLayout.class, "withTargetLayout", false);
Objects.requireNonNull(layout);
return new OfAddressImpl(order(), byteSize(), byteAlignment(), layout, name());
}
diff --git a/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
index 8d228c050c605..0e3b178c32b0a 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
@@ -38,6 +38,7 @@ class NativeImageBuffer {
static {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
+ @SuppressWarnings("restricted")
public Void run() {
System.loadLibrary("jimage");
return null;
diff --git a/src/java.base/share/classes/jdk/internal/loader/Resource.java b/src/java.base/share/classes/jdk/internal/loader/Resource.java
index d119c4b5eae9f..b72f4df7d52eb 100644
--- a/src/java.base/share/classes/jdk/internal/loader/Resource.java
+++ b/src/java.base/share/classes/jdk/internal/loader/Resource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -28,7 +28,6 @@
import java.io.EOFException;
import java.net.URL;
import java.io.IOException;
-import java.io.InterruptedIOException;
import java.io.InputStream;
import java.security.CodeSigner;
import java.util.jar.Manifest;
@@ -87,25 +86,8 @@ public byte[] getBytes() throws IOException {
// Get stream before content length so that a FileNotFoundException
// can propagate upwards without being caught too early
InputStream in = cachedInputStream();
-
- // This code has been uglified to protect against interrupts.
- // Even if a thread has been interrupted when loading resources,
- // the IO should not abort, so must carefully retry, failing only
- // if the retry leads to some other IO exception.
-
- boolean isInterrupted = Thread.interrupted();
- int len;
- for (;;) {
- try {
- len = getContentLength();
- break;
- } catch (InterruptedIOException iioe) {
- Thread.interrupted();
- isInterrupted = true;
- }
- }
-
try {
+ int len = getContentLength();
b = new byte[0];
if (len == -1) len = Integer.MAX_VALUE;
int pos = 0;
@@ -121,13 +103,7 @@ public byte[] getBytes() throws IOException {
} else {
bytesToRead = b.length - pos;
}
- int cc = 0;
- try {
- cc = in.read(b, pos, bytesToRead);
- } catch (InterruptedIOException iioe) {
- Thread.interrupted();
- isInterrupted = true;
- }
+ int cc = in.read(b, pos, bytesToRead);
if (cc < 0) {
if (len != Integer.MAX_VALUE) {
throw new EOFException("Detect premature EOF");
@@ -143,13 +119,7 @@ public byte[] getBytes() throws IOException {
} finally {
try {
in.close();
- } catch (InterruptedIOException iioe) {
- isInterrupted = true;
} catch (IOException ignore) {}
-
- if (isInterrupted) {
- Thread.currentThread().interrupt();
- }
}
return b;
}
diff --git a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
index dbd76e07d4f46..297c77bc106c7 100644
--- a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
+++ b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -59,7 +59,6 @@
import java.util.StringTokenizer;
import java.util.jar.JarFile;
import java.util.zip.CRC32;
-import java.util.zip.ZipEntry;
import java.util.jar.JarEntry;
import java.util.jar.Manifest;
import java.util.jar.Attributes;
@@ -439,27 +438,38 @@ private synchronized Loader getLoader(int index) {
continue;
}
// Otherwise, create a new Loader for the URL.
- Loader loader;
+ Loader loader = null;
+ final URL[] loaderClassPathURLs;
try {
loader = getLoader(url);
// If the loader defines a local class path then add the
// URLs as the next URLs to be opened.
- URL[] urls = loader.getClassPath();
- if (urls != null) {
- push(urls);
- }
+ loaderClassPathURLs = loader.getClassPath();
} catch (IOException e) {
- // Silently ignore for now...
+ // log the error and close the unusable loader (if any)
+ if (DEBUG) {
+ System.err.println("Failed to construct a loader or construct its" +
+ " local classpath for " + url + ", cause:" + e);
+ }
+ if (loader != null) {
+ closeQuietly(loader);
+ }
continue;
} catch (SecurityException se) {
- // Always silently ignore. The context, if there is one, that
- // this URLClassPath was given during construction will never
- // have permission to access the URL.
+ // log the error and close the unusable loader (if any).
+ // The context, if there is one, that this URLClassPath was
+ // given during construction will never have permission to access the URL.
if (DEBUG) {
System.err.println("Failed to access " + url + ", " + se );
}
+ if (loader != null) {
+ closeQuietly(loader);
+ }
continue;
}
+ if (loaderClassPathURLs != null) {
+ push(loaderClassPathURLs);
+ }
// Finally, add the Loader to the search path.
loaders.add(loader);
lmap.put(urlNoFragString, loader);
@@ -467,6 +477,17 @@ private synchronized Loader getLoader(int index) {
return loaders.get(index);
}
+ // closes the given loader and ignores any IOException that may occur during close
+ private static void closeQuietly(final Loader loader) {
+ try {
+ loader.close();
+ } catch (IOException ioe) {
+ if (DEBUG) {
+ System.err.println("ignoring exception " + ioe + " while closing loader " + loader);
+ }
+ }
+ }
+
/*
* Returns the Loader for the specified base URL.
*/
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
index b97b0a2de40b0..facff0d6fdce8 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -787,17 +787,23 @@ private static void addExtraExportsOrOpens(ModuleLayer bootLayer,
}
}
- private static final boolean HAS_ENABLE_NATIVE_ACCESS_FLAG;
private static final Set USER_NATIVE_ACCESS_MODULES;
private static final Set JDK_NATIVE_ACCESS_MODULES;
+ private static final IllegalNativeAccess ILLEGAL_NATIVE_ACCESS;
- public static boolean hasEnableNativeAccessFlag() {
- return HAS_ENABLE_NATIVE_ACCESS_FLAG;
+ public enum IllegalNativeAccess {
+ ALLOW,
+ WARN,
+ DENY
+ }
+
+ public static IllegalNativeAccess illegalNativeAccess() {
+ return ILLEGAL_NATIVE_ACCESS;
}
static {
+ ILLEGAL_NATIVE_ACCESS = addIllegalNativeAccess();
USER_NATIVE_ACCESS_MODULES = decodeEnableNativeAccess();
- HAS_ENABLE_NATIVE_ACCESS_FLAG = !USER_NATIVE_ACCESS_MODULES.isEmpty();
JDK_NATIVE_ACCESS_MODULES = ModuleLoaderMap.nativeAccessModules();
}
@@ -847,6 +853,27 @@ private static Set decodeEnableNativeAccess() {
return modules;
}
+ /**
+ * Process the --illegal-native-access option (and its default).
+ */
+ private static IllegalNativeAccess addIllegalNativeAccess() {
+ String value = getAndRemoveProperty("jdk.module.illegal.native.access");
+ // don't use a switch: bootstrapping issues!
+ if (value == null) {
+ return IllegalNativeAccess.WARN; // default
+ } else if (value.equals("deny")) {
+ return IllegalNativeAccess.DENY;
+ } else if (value.equals("allow")) {
+ return IllegalNativeAccess.ALLOW;
+ } else if (value.equals("warn")) {
+ return IllegalNativeAccess.WARN;
+ } else {
+ fail("Value specified to --illegal-native-access not recognized:"
+ + " '" + value + "'");
+ return null;
+ }
+ }
+
/**
* Decodes the values of --add-reads, -add-exports, --add-opens or
* --patch-modules options that are encoded in system properties.
diff --git a/src/java.base/share/classes/jdk/internal/reflect/Reflection.java b/src/java.base/share/classes/jdk/internal/reflect/Reflection.java
index f6fa499538834..88098b11942be 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/Reflection.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/Reflection.java
@@ -111,7 +111,7 @@ public static void ensureMemberAccess(Class currentClass,
}
@ForceInline
- public static void ensureNativeAccess(Class currentClass, Class owner, String methodName) {
+ public static void ensureNativeAccess(Class currentClass, Class owner, String methodName, boolean jni) {
// if there is no caller class, act as if the call came from unnamed module of system class loader
Module module = currentClass != null ?
currentClass.getModule() :
@@ -119,7 +119,10 @@ public static void ensureNativeAccess(Class currentClass, Class owner, Str
class Holder {
static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
}
- Holder.JLA.ensureNativeAccess(module, owner, methodName, currentClass);
+ if (module != null) {
+ // not in init phase
+ Holder.JLA.ensureNativeAccess(module, owner, methodName, currentClass, jni);
+ }
}
/**
diff --git a/src/java.base/share/classes/jdk/internal/vm/Continuation.java b/src/java.base/share/classes/jdk/internal/vm/Continuation.java
index 5c1d41c36d97d..99d0c62aaec8d 100644
--- a/src/java.base/share/classes/jdk/internal/vm/Continuation.java
+++ b/src/java.base/share/classes/jdk/internal/vm/Continuation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -427,6 +427,7 @@ public boolean isPreempted() {
* Pins the current continuation (enters a critical section).
* This increments an internal semaphore that, when greater than 0, pins the continuation.
*/
+ @IntrinsicCandidate
public static native void pin();
/**
@@ -434,6 +435,7 @@ public boolean isPreempted() {
* This decrements an internal semaphore that, when equal 0, unpins the current continuation
* if pinned with {@link #pin()}.
*/
+ @IntrinsicCandidate
public static native void unpin();
/**
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 52c1029dd3d52..74a7451582cf7 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -256,7 +256,8 @@
jdk.internal.jvmstat,
jdk.management,
jdk.management.agent,
- jdk.internal.vm.ci;
+ jdk.internal.vm.ci,
+ jdk.jfr;
exports jdk.internal.vm.annotation to
java.instrument,
jdk.internal.vm.ci,
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
index cd524955419a5..71cdb161fc029 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
@@ -65,6 +65,11 @@ java.launcher.opt.footer = \
\ --enable-native-access [,...]\n\
\ allow code in modules to access code and data outside the Java runtime.\n\
\ can also be ALL-UNNAMED to indicate code on the class path.\n\
+\ --illegal-native-access=\n\
+\ allow or deny access to code and data outside the Java runtime\n\
+\ by code in modules for which native access is not explicitly enabled.\n\
+\ is one of "deny", "warn" or "allow". The default value is "warn".\n\
+\ This option will be removed in a future release.\n\
\ --list-modules\n\
\ list observable modules and exit\n\
\ -d \n\
diff --git a/src/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index 604a15fe1a683..6c7c8b4514933 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.java
@@ -1139,7 +1139,9 @@ private void onConsumeFinished(ServerHandshakeContext shc,
//
// produce
- NewSessionTicket.t13PosthandshakeProducer.produce(shc);
+ if (SSLConfiguration.serverNewSessionTicketCount > 0) {
+ NewSessionTicket.t13PosthandshakeProducer.produce(shc);
+ }
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
index 0655b0e14ee15..8be021b41114c 100644
--- a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
+++ b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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,11 +25,11 @@
package sun.security.ssl;
import java.io.IOException;
-import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.security.GeneralSecurityException;
import java.security.SecureRandom;
import java.text.MessageFormat;
+import java.util.Arrays;
import java.util.Locale;
import javax.crypto.SecretKey;
import javax.net.ssl.SSLHandshakeException;
@@ -118,11 +118,6 @@ static final class T12NewSessionTicketMessage extends NewSessionTicketMessage {
this.ticket = Record.getBytes16(m);
}
- @Override
- public SSLHandshake handshakeType() {
- return NEW_SESSION_TICKET;
- }
-
@Override
public int messageLength() {
return 4 + // ticketLifetime
@@ -221,11 +216,6 @@ static final class T13NewSessionTicketMessage extends NewSessionTicketMessage {
this.extensions = new SSLExtensions(this, m, supportedExtensions);
}
- @Override
- public SSLHandshake handshakeType() {
- return NEW_SESSION_TICKET;
- }
-
int getTicketAgeAdd() {
return ticketAgeAdd;
}
@@ -301,7 +291,7 @@ private static SecretKey derivePreSharedKey(CipherSuite.HashAlg hashAlg,
"tls13 resumption".getBytes(), nonce, hashAlg.hashLength);
return hkdf.expand(resumptionMasterSecret, hkdfInfo,
hashAlg.hashLength, "TlsPreSharedKey");
- } catch (GeneralSecurityException gse) {
+ } catch (GeneralSecurityException gse) {
throw new SSLHandshakeException("Could not derive PSK", gse);
}
}
@@ -332,8 +322,7 @@ public byte[] produce(ConnectionContext context) throws IOException {
// Is this session resumable?
if (!hc.handshakeSession.isRejoinable()) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
- SSLLogger.fine(
- "No session ticket produced: " +
+ SSLLogger.fine("No session ticket produced: " +
"session is not resumable");
}
@@ -351,8 +340,7 @@ public byte[] produce(ConnectionContext context) throws IOException {
if (pkemSpec == null ||
!pkemSpec.contains(PskKeyExchangeMode.PSK_DHE_KE)) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
- SSLLogger.fine(
- "No session ticket produced: " +
+ SSLLogger.fine("No session ticket produced: " +
"client does not support psk_dhe_ke");
}
@@ -363,8 +351,7 @@ public byte[] produce(ConnectionContext context) throws IOException {
// using an allowable PSK exchange key mode.
if (!hc.handshakeSession.isPSKable()) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
- SSLLogger.fine(
- "No session ticket produced: " +
+ SSLLogger.fine("No session ticket produced: " +
"No session ticket allowed in this session");
}
@@ -375,76 +362,113 @@ public byte[] produce(ConnectionContext context) throws IOException {
// get a new session ID
SSLSessionContextImpl sessionCache = (SSLSessionContextImpl)
hc.sslContext.engineGetServerSessionContext();
- SessionId newId = new SessionId(true,
- hc.sslContext.getSecureRandom());
-
- SecretKey resumptionMasterSecret =
- hc.handshakeSession.getResumptionMasterSecret();
- if (resumptionMasterSecret == null) {
+ int sessionTimeoutSeconds = sessionCache.getSessionTimeout();
+ if (sessionTimeoutSeconds > MAX_TICKET_LIFETIME) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
- SSLLogger.fine(
- "No session ticket produced: " +
- "no resumption secret");
+ SSLLogger.fine("No session ticket produced: " +
+ "session timeout is too long");
}
return null;
}
- // construct the PSK and handshake message
- BigInteger nonce = hc.handshakeSession.incrTicketNonceCounter();
- byte[] nonceArr = nonce.toByteArray();
- SecretKey psk = derivePreSharedKey(
- hc.negotiatedCipherSuite.hashAlg,
- resumptionMasterSecret, nonceArr);
-
- int sessionTimeoutSeconds = sessionCache.getSessionTimeout();
- if (sessionTimeoutSeconds > MAX_TICKET_LIFETIME) {
- if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
- SSLLogger.fine(
- "No session ticket produced: " +
- "session timeout");
+ // Send NewSessionTickets to the client based
+ if (SSLConfiguration.serverNewSessionTicketCount > 0) {
+ int i = 0;
+ NewSessionTicketMessage nstm;
+ while (i < SSLConfiguration.serverNewSessionTicketCount) {
+ nstm = generateNST(hc, sessionCache);
+ if (nstm == null) {
+ break;
+ }
+ nstm.write(hc.handshakeOutput);
+ i++;
}
- return null;
+ hc.handshakeOutput.flush();
+ }
+ /*
+ * With large NST counts, a client that quickly closes after
+ * TLS Finished completes can cause SocketExceptions such as:
+ * Windows servers read-side throwing SocketException:
+ * "An established connection was aborted by the software in
+ * your host machine", which relates to error WSAECONNABORTED.
+ * A SocketException caused by a "broken pipe" has been observed on
+ * other systems.
+ * These are very unlikely situations when client and server are on
+ * different machines.
+ *
+ * RFC 8446 does not put requirements when an NST needs to be
+ * sent, but it should be sent very soon after TLS Finished for
+ * clients that will quickly resume to create more sessions.
+ * TLS 1.3 is different from TLS 1.2, there is more data the client
+ * should be aware of
+ */
+
+ // See note on TransportContext.needHandshakeFinishedStatus.
+ //
+ // Reset the needHandshakeFinishedStatus flag. The delivery
+ // of this post-handshake message will indicate the FINISHED
+ // handshake status. It is not needed to have a follow-on
+ // SSLEngine.wrap() any longer.
+ if (hc.conContext.needHandshakeFinishedStatus) {
+ hc.conContext.needHandshakeFinishedStatus = false;
}
- NewSessionTicketMessage nstm = null;
+ // clean the post handshake context
+ hc.conContext.finishPostHandshake();
+
+ // The message has been delivered.
+ return null;
+ }
+
+ private NewSessionTicketMessage generateNST(HandshakeContext hc,
+ SSLSessionContextImpl sessionCache) throws IOException {
+
+ NewSessionTicketMessage nstm;
+ SessionId newId = new SessionId(true,
+ hc.sslContext.getSecureRandom());
+
+ // construct the PSK and handshake message
+ byte[] nonce = hc.handshakeSession.incrTicketNonceCounter();
SSLSessionImpl sessionCopy =
- new SSLSessionImpl(hc.handshakeSession, newId);
- sessionCopy.setPreSharedKey(psk);
+ new SSLSessionImpl(hc.handshakeSession, newId);
+ sessionCopy.setPreSharedKey(derivePreSharedKey(
+ hc.negotiatedCipherSuite.hashAlg,
+ hc.handshakeSession.getResumptionMasterSecret(), nonce));
sessionCopy.setPskIdentity(newId.getId());
// If a stateless ticket is allowed, attempt to make one
if (hc.statelessResumption &&
hc.handshakeSession.isStatelessable()) {
nstm = new T13NewSessionTicketMessage(hc,
- sessionTimeoutSeconds,
+ sessionCache.getSessionTimeout(),
hc.sslContext.getSecureRandom(),
- nonceArr,
+ nonce,
new SessionTicketSpec().encrypt(hc, sessionCopy));
// If ticket construction failed, switch to session cache
if (!nstm.isValid()) {
hc.statelessResumption = false;
} else {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
- SSLLogger.fine(
- "Produced NewSessionTicket stateless " +
+ SSLLogger.fine("Produced NewSessionTicket stateless " +
"post-handshake message", nstm);
}
}
+ return nstm;
}
// If a session cache ticket is being used, make one
if (!hc.statelessResumption ||
!hc.handshakeSession.isStatelessable()) {
- nstm = new T13NewSessionTicketMessage(hc, sessionTimeoutSeconds,
- hc.sslContext.getSecureRandom(), nonceArr,
- newId.getId());
+ nstm = new T13NewSessionTicketMessage(hc,
+ sessionCache.getSessionTimeout(),
+ hc.sslContext.getSecureRandom(), nonce,
+ newId.getId());
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
- SSLLogger.fine(
- "Produced NewSessionTicket post-handshake message",
- nstm);
+ SSLLogger.fine("Produced NewSessionTicket " +
+ "post-handshake message", nstm);
}
// create and cache the new session
@@ -453,29 +477,13 @@ public byte[] produce(ConnectionContext context) throws IOException {
hc.handshakeSession.addChild(sessionCopy);
sessionCopy.setTicketAgeAdd(nstm.getTicketAgeAdd());
sessionCache.put(sessionCopy);
+ return nstm;
}
- // Output the handshake message.
- if (nstm != null) {
- // should never be null
- nstm.write(hc.handshakeOutput);
- hc.handshakeOutput.flush();
-
- // See note on TransportContext.needHandshakeFinishedStatus.
- //
- // Reset the needHandshakeFinishedStatus flag. The delivery
- // of this post-handshake message will indicate the FINISHED
- // handshake status. It is not needed to have a follow-on
- // SSLEngine.wrap() any longer.
- if (hc.conContext.needHandshakeFinishedStatus) {
- hc.conContext.needHandshakeFinishedStatus = false;
- }
+ if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+ SSLLogger.fine("No NewSessionTicket created");
}
- // clean the post handshake context
- hc.conContext.finishPostHandshake();
-
- // The message has been delivered.
return null;
}
}
@@ -497,8 +505,9 @@ public byte[] produce(ConnectionContext context,
ServerHandshakeContext shc = (ServerHandshakeContext)context;
- // Is this session resumable?
- if (!shc.handshakeSession.isRejoinable()) {
+ // Are new tickets allowed? If so, is this session resumable?
+ if (SSLConfiguration.serverNewSessionTicketCount == 0 ||
+ !shc.handshakeSession.isRejoinable()) {
return null;
}
@@ -578,7 +587,6 @@ public void consume(ConnectionContext context,
"Discarding NewSessionTicket with lifetime " +
nstm.ticketLifetime, nstm);
}
- sessionCache.remove(hc.handshakeSession.getSessionId());
return;
}
@@ -619,13 +627,19 @@ public void consume(ConnectionContext context,
sessionCopy.setPreSharedKey(psk);
sessionCopy.setTicketAgeAdd(nstm.getTicketAgeAdd());
sessionCopy.setPskIdentity(nstm.ticket);
- sessionCache.put(sessionCopy);
+ sessionCache.put(sessionCopy, sessionCopy.isPSK());
+
+ if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+ SSLLogger.fine("MultiNST PSK (Server): " +
+ Utilities.toHexString(Arrays.copyOf(nstm.ticket, 16)));
+ }
// clean the post handshake context
hc.conContext.finishPostHandshake();
}
}
+ /* TLS 1.2 spec does not specify multiple NST behavior.*/
private static final
class T12NewSessionTicketConsumer implements SSLConsumer {
// Prevent instantiation of this class.
@@ -674,8 +688,7 @@ public void consume(ConnectionContext context,
hc.handshakeSession.setPskIdentity(nstm.ticket);
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
- SSLLogger.fine("Consuming NewSessionTicket\n" +
- nstm.toString());
+ SSLLogger.fine("Consuming NewSessionTicket\n" + nstm);
}
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
index 1d3ee2ece9d5a..43214841987f9 100644
--- a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -699,11 +699,13 @@ public byte[] produce(ConnectionContext context,
//The session cannot be used again. Remove it from the cache.
SSLSessionContextImpl sessionCache = (SSLSessionContextImpl)
chc.sslContext.engineGetClientSessionContext();
- sessionCache.remove(chc.resumingSession.getSessionId());
+ sessionCache.remove(chc.resumingSession.getSessionId(), true);
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
SSLLogger.fine(
"Found resumable session. Preparing PSK message.");
+ SSLLogger.fine(
+ "MultiNST PSK (Client): " + Utilities.toHexString(Arrays.copyOf(chc.pskIdentity, 16)));
}
List identities = new ArrayList<>();
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
index fcf93704ef9c1..421867aa4c4b2 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -121,6 +121,11 @@ final class SSLConfiguration implements Cloneable {
static final boolean enableDtlsResumeCookie = Utilities.getBooleanProperty(
"jdk.tls.enableDtlsResumeCookie", true);
+ // Number of NewSessionTickets that will be sent by the server.
+ static final int serverNewSessionTicketCount;
+ // Default for NewSessionTickets
+ static final int SERVER_NST_DEFAULT = 1;
+
// Is the extended_master_secret extension supported?
static {
boolean supportExtendedMasterSecret = Utilities.getBooleanProperty(
@@ -182,7 +187,7 @@ final class SSLConfiguration implements Cloneable {
* - Otherwise it is set to a default value of 10.
*/
Integer inboundServerLen = GetIntegerAction.privilegedGetProperty(
- "jdk.tls.client.maxInboundCertificateChainLength");
+ "jdk.tls.client.maxInboundCertificateChainLength");
// Default for jdk.tls.client.maxInboundCertificateChainLength is 10
if (inboundServerLen == null || inboundServerLen < 0) {
@@ -191,6 +196,33 @@ final class SSLConfiguration implements Cloneable {
} else {
maxInboundServerCertChainLen = inboundServerLen;
}
+
+ /*
+ * jdk.tls.server.newSessionTicketCount system property
+ * Sets the number of NewSessionTickets sent to a TLS 1.3 resumption
+ * client. The value must be between 0 and 10. Default is defined by
+ * SERVER_NST_DEFAULT.
+ */
+ Integer nstServerCount = GetIntegerAction.privilegedGetProperty(
+ "jdk.tls.server.newSessionTicketCount");
+ if (nstServerCount == null || nstServerCount < 0 ||
+ nstServerCount > 10) {
+ serverNewSessionTicketCount = SERVER_NST_DEFAULT;
+ if (nstServerCount != null && SSLLogger.isOn &&
+ SSLLogger.isOn("ssl,handshake")) {
+ SSLLogger.fine(
+ "jdk.tls.server.newSessionTicketCount defaults to " +
+ SERVER_NST_DEFAULT + " as the property was not " +
+ "between 0 and 10");
+ }
+ } else {
+ serverNewSessionTicketCount = nstServerCount;
+ if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+ SSLLogger.fine(
+ "jdk.tls.server.newSessionTicketCount set to " +
+ serverNewSessionTicketCount);
+ }
+ }
}
SSLConfiguration(SSLContextImpl sslContext, boolean isClientMode) {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
index a33f8b0d13a5f..36b5bd4a78c20 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -416,11 +416,12 @@ private HandshakeStatus tryNewSessionTicket(
HandshakeStatus currentHandshakeStatus) throws IOException {
// Don't bother to kickstart if handshaking is in progress, or if the
// connection is not duplex-open.
- if ((conContext.handshakeContext == null) &&
- conContext.protocolVersion.useTLS13PlusSpec() &&
- !conContext.isOutboundClosed() &&
- !conContext.isInboundClosed() &&
- !conContext.isBroken) {
+ if (SSLConfiguration.serverNewSessionTicketCount > 0 &&
+ conContext.handshakeContext == null &&
+ conContext.protocolVersion.useTLS13PlusSpec() &&
+ !conContext.isOutboundClosed() &&
+ !conContext.isInboundClosed() &&
+ !conContext.isBroken) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
SSLLogger.finest("trigger NST");
}
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
index eb9eb75debe29..f3e22633ab4bc 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -63,6 +63,7 @@
final class SSLSessionContextImpl implements SSLSessionContext {
private static final int DEFAULT_MAX_CACHE_SIZE = 20480;
+ private static final int DEFAULT_MAX_QUEUE_SIZE = 10;
// Default lifetime of a session. 24 hours
static final int DEFAULT_SESSION_TIMEOUT = 86400;
@@ -87,14 +88,17 @@ final class SSLSessionContextImpl implements SSLSessionContext {
cacheLimit = getDefaults(server); // default cache size
// use soft reference
- sessionCache = Cache.newSoftMemoryCache(cacheLimit, timeout);
- sessionHostPortCache = Cache.newSoftMemoryCache(cacheLimit, timeout);
if (server) {
+ sessionCache = Cache.newSoftMemoryCache(cacheLimit, timeout);
+ sessionHostPortCache = Cache.newSoftMemoryCache(cacheLimit, timeout);
keyHashMap = new ConcurrentHashMap<>();
// Should be "randomly generated" according to RFC 5077,
- // but doesn't necessarily has to be a true random number.
+ // but doesn't necessarily have to be a true random number.
currentKeyID = new Random(System.nanoTime()).nextInt();
} else {
+ sessionCache = Cache.newSoftMemoryCache(cacheLimit, timeout);
+ sessionHostPortCache = Cache.newSoftMemoryQueue(cacheLimit, timeout,
+ DEFAULT_MAX_QUEUE_SIZE);
keyHashMap = Map.of();
}
}
@@ -277,12 +281,22 @@ private static String getKey(String hostname, int port) {
// time it created, which is a little longer than the expected. So
// please do check isTimedout() while getting entry from the cache.
void put(SSLSessionImpl s) {
+ put(s, false);
+ }
+
+ /**
+ * Put an entry in the cache
+ * @param s SSLSessionImpl entry to be stored
+ * @param canQueue True if multiple entries may exist under one
+ * session entry.
+ */
+ void put(SSLSessionImpl s, boolean canQueue) {
sessionCache.put(s.getSessionId(), s);
// If no hostname/port info is available, don't add this one.
if ((s.getPeerHost() != null) && (s.getPeerPort() != -1)) {
sessionHostPortCache.put(
- getKey(s.getPeerHost(), s.getPeerPort()), s);
+ getKey(s.getPeerHost(), s.getPeerPort()), s, canQueue);
}
s.setContext(this);
@@ -290,11 +304,17 @@ void put(SSLSessionImpl s) {
// package-private method, remove a cached SSLSession
void remove(SessionId key) {
+ remove(key, false);
+ }
+ void remove(SessionId key, boolean isClient) {
SSLSessionImpl s = sessionCache.get(key);
if (s != null) {
sessionCache.remove(key);
- sessionHostPortCache.remove(
+ // A client keeps the cache entry for queued NST resumption.
+ if (!isClient) {
+ sessionHostPortCache.remove(
getKey(s.getPeerHost(), s.getPeerPort()));
+ }
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
index a0708618e157b..b887eedd8dcfd 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -38,7 +38,6 @@
import java.util.Queue;
import java.util.Collection;
import java.util.Collections;
-import java.util.Enumeration;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -132,7 +131,11 @@ final class SSLSessionImpl extends ExtendedSSLSession {
private final List requestedServerNames;
// Counter used to create unique nonces in NewSessionTicket
- private BigInteger ticketNonceCounter = BigInteger.ONE;
+ private byte ticketNonceCounter = 1;
+
+ // This boolean is true when a new set of NewSessionTickets are needed after
+ // the initial ones sent after the handshake.
+ boolean updateNST = false;
// The endpoint identification algorithm used to check certificates
// in this session.
@@ -492,7 +495,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
// Length of pre-shared key algorithm (one byte)
i = buf.get();
b = new byte[i];
- buf.get(b, 0 , i);
+ buf.get(b, 0, i);
String alg = new String(b);
// Get length of encoding
i = Short.toUnsignedInt(buf.getShort());
@@ -501,8 +504,13 @@ final class SSLSessionImpl extends ExtendedSSLSession {
buf.get(b);
this.preSharedKey = new SecretKeySpec(b, alg);
// Get identity len
- this.pskIdentity = new byte[buf.get()];
- buf.get(pskIdentity);
+ i = buf.get();
+ if (i > 0) {
+ this.pskIdentity = new byte[buf.get()];
+ buf.get(pskIdentity);
+ } else {
+ this.pskIdentity = null;
+ }
break;
default:
throw new SSLException("Failed local certs of session.");
@@ -715,14 +723,12 @@ void setPskIdentity(byte[] pskIdentity) {
this.pskIdentity = pskIdentity;
}
- BigInteger incrTicketNonceCounter() {
- BigInteger result = ticketNonceCounter;
- ticketNonceCounter = ticketNonceCounter.add(BigInteger.ONE);
- return result;
+ byte[] incrTicketNonceCounter() {
+ return new byte[] {ticketNonceCounter++};
}
boolean isPSKable() {
- return (ticketNonceCounter.compareTo(BigInteger.ZERO) > 0);
+ return (ticketNonceCounter > 0);
}
/**
@@ -781,6 +787,10 @@ byte[] getPskIdentity() {
return pskIdentity;
}
+ public boolean isPSK() {
+ return (pskIdentity != null && pskIdentity.length > 0);
+ }
+
void setPeerCertificates(X509Certificate[] peer) {
if (peerCerts == null) {
peerCerts = peer;
@@ -1230,7 +1240,6 @@ public void invalidate() {
* sessions can be shared across different protection domains.
*/
private final ConcurrentHashMap boundValues;
- boolean updateNST;
/**
* Assigns a session value. Session change events are given if
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index 9f22a5bb455c0..bec6d84484711 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -1321,7 +1321,6 @@ public void write(byte[] b,
}
// Check if NewSessionTicket PostHandshake message needs to be sent
if (conContext.conSession.updateNST) {
- conContext.conSession.updateNST = false;
tryNewSessionTicket();
}
}
@@ -1556,15 +1555,17 @@ private void tryKeyUpdate() throws IOException {
private void tryNewSessionTicket() throws IOException {
// Don't bother to kickstart if handshaking is in progress, or if the
// connection is not duplex-open.
- if (!conContext.sslConfig.isClientMode &&
- conContext.protocolVersion.useTLS13PlusSpec() &&
- conContext.handshakeContext == null &&
- !conContext.isOutboundClosed() &&
- !conContext.isInboundClosed() &&
- !conContext.isBroken) {
+ if (SSLConfiguration.serverNewSessionTicketCount > 0 &&
+ !conContext.sslConfig.isClientMode &&
+ conContext.protocolVersion.useTLS13PlusSpec() &&
+ conContext.handshakeContext == null &&
+ !conContext.isOutboundClosed() &&
+ !conContext.isInboundClosed() &&
+ !conContext.isBroken) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl")) {
SSLLogger.finest("trigger new session ticket");
}
+ conContext.conSession.updateNST = false;
NewSessionTicket.t13PosthandshakeProducer.produce(
new PostHandshakeContext(conContext));
}
diff --git a/src/java.base/share/classes/sun/security/util/Cache.java b/src/java.base/share/classes/sun/security/util/Cache.java
index 29dd19830c0ae..3d8350c1ecd76 100644
--- a/src/java.base/share/classes/sun/security/util/Cache.java
+++ b/src/java.base/share/classes/sun/security/util/Cache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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,12 @@
package sun.security.util;
+import javax.net.ssl.SSLSession;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
import java.util.*;
-import java.lang.ref.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* Abstract base class and factory for caches. A cache is a key-value mapping.
@@ -90,6 +94,15 @@ protected Cache() {
*/
public abstract void put(K key, V value);
+ /**
+ * Add V to the cache with the option to use a QueueCacheEntry if the
+ * cache is configured for it. If the cache is not configured for a queue,
+ * V will silently add the entry directly.
+ */
+ public void put(K key, V value, boolean canQueue) {
+ put(key, value);
+ }
+
/**
* Get a value from the cache.
*/
@@ -137,6 +150,11 @@ public static Cache newSoftMemoryCache(int size, int timeout) {
return new MemoryCache<>(true, size, timeout);
}
+ public static Cache newSoftMemoryQueue(int size, int timeout,
+ int maxQueueSize) {
+ return new MemoryCache<>(true, size, timeout, maxQueueSize);
+ }
+
/**
* Return a new memory cache with the specified maximum size, unlimited
* lifetime for entries, with the values held by standard references.
@@ -248,13 +266,12 @@ public void accept(CacheVisitor visitor) {
class MemoryCache extends Cache {
- private static final float LOAD_FACTOR = 0.75f;
-
- // XXXX
+ // Debugging
private static final boolean DEBUG = false;
private final Map> cacheMap;
private int maxSize;
+ final private int maxQueueSize;
private long lifetime;
private long nextExpirationTime = Long.MAX_VALUE;
@@ -263,18 +280,25 @@ class MemoryCache extends Cache {
private final ReferenceQueue queue;
public MemoryCache(boolean soft, int maxSize) {
- this(soft, maxSize, 0);
+ this(soft, maxSize, 0, 0);
}
public MemoryCache(boolean soft, int maxSize, int lifetime) {
+ this(soft, maxSize, lifetime, 0);
+ }
+
+ public MemoryCache(boolean soft, int maxSize, int lifetime, int qSize) {
this.maxSize = maxSize;
+ this.maxQueueSize = qSize;
this.lifetime = lifetime * 1000L;
- if (soft)
+ if (soft) {
this.queue = new ReferenceQueue<>();
- else
+ } else {
this.queue = null;
-
- cacheMap = new LinkedHashMap<>(1, LOAD_FACTOR, true);
+ }
+ // LinkedHashMap is needed for its access order. 0.75f load factor is
+ // default.
+ cacheMap = new LinkedHashMap<>(1, 0.75f, true);
}
/**
@@ -338,6 +362,10 @@ private void expungeExpiredEntries() {
cnt++;
} else if (nextExpirationTime > entry.getExpirationTime()) {
nextExpirationTime = entry.getExpirationTime();
+ // If this is a queue, check for some expired entries
+ if (entry instanceof QueueCacheEntry qe) {
+ qe.getQueue().removeIf(e -> !e.isValid(time));
+ }
}
}
if (DEBUG) {
@@ -367,18 +395,60 @@ public synchronized void clear() {
cacheMap.clear();
}
- public synchronized void put(K key, V value) {
+ public void put(K key, V value) {
+ put(key, value, false);
+ }
+
+ /**
+ * This puts an entry into the cacheMap.
+ *
+ * If canQueue is true, V will be added using a QueueCacheEntry which
+ * is added to cacheMap. If false, V is added to the cacheMap directly.
+ * The caller must keep a consistent canQueue value, mixing them can
+ * result in a queue being replaced with a single entry.
+ *
+ * This method is synchronized to avoid multiple QueueCacheEntry
+ * overwriting the same key.
+ *
+ * @param key key to the cacheMap
+ * @param value value to be stored
+ * @param canQueue can the value be put into a QueueCacheEntry
+ */
+ public synchronized void put(K key, V value, boolean canQueue) {
emptyQueue();
- long expirationTime = (lifetime == 0) ? 0 :
- System.currentTimeMillis() + lifetime;
+ long expirationTime =
+ (lifetime == 0) ? 0 : System.currentTimeMillis() + lifetime;
if (expirationTime < nextExpirationTime) {
nextExpirationTime = expirationTime;
}
CacheEntry newEntry = newEntry(key, value, expirationTime, queue);
- CacheEntry oldEntry = cacheMap.put(key, newEntry);
- if (oldEntry != null) {
- oldEntry.invalidate();
- return;
+ if (maxQueueSize == 0 || !canQueue) {
+ CacheEntry oldEntry = cacheMap.put(key, newEntry);
+ if (oldEntry != null) {
+ oldEntry.invalidate();
+ }
+ } else {
+ CacheEntry entry = cacheMap.get(key);
+ switch (entry) {
+ case QueueCacheEntry qe -> {
+ qe.putValue(newEntry);
+ if (DEBUG) {
+ System.out.println("QueueCacheEntry= " + qe);
+ final AtomicInteger i = new AtomicInteger(1);
+ qe.queue.stream().forEach(e ->
+ System.out.println(i.getAndIncrement() + "= " + e));
+ }
+ }
+ case null, default ->
+ cacheMap.put(key, new QueueCacheEntry<>(key, newEntry,
+ expirationTime, maxQueueSize));
+ }
+
+ if (DEBUG) {
+ System.out.println("Cache entry added: key=" +
+ key.toString() + ", class=" +
+ (entry != null ? entry.getClass().getName() : null));
+ }
}
if (maxSize > 0 && cacheMap.size() > maxSize) {
expungeExpiredEntries();
@@ -401,25 +471,37 @@ public synchronized V get(Object key) {
if (entry == null) {
return null;
}
- long time = (lifetime == 0) ? 0 : System.currentTimeMillis();
- if (!entry.isValid(time)) {
+
+ if (lifetime > 0 && !entry.isValid(System.currentTimeMillis())) {
+ cacheMap.remove(key);
if (DEBUG) {
System.out.println("Ignoring expired entry");
}
- cacheMap.remove(key);
return null;
}
+
+ // If the value is a queue, return a queue entry.
+ if (entry instanceof QueueCacheEntry qe) {
+ V result = qe.getValue(lifetime);
+ if (qe.isEmpty()) {
+ removeImpl(key);
+ }
+ return result;
+ }
return entry.getValue();
}
public synchronized void remove(Object key) {
emptyQueue();
+ removeImpl(key);
+ }
+
+ private void removeImpl(Object key) {
CacheEntry entry = cacheMap.remove(key);
if (entry != null) {
entry.invalidate();
}
}
-
public synchronized V pull(Object key) {
emptyQueue();
CacheEntry entry = cacheMap.remove(key);
@@ -550,9 +632,8 @@ public void invalidate() {
}
}
- private static class SoftCacheEntry
- extends SoftReference
- implements CacheEntry {
+ private static class SoftCacheEntry extends SoftReference
+ implements CacheEntry {
private K key;
private long expirationTime;
@@ -589,6 +670,116 @@ public void invalidate() {
key = null;
expirationTime = -1;
}
+
+ @Override
+ public String toString() {
+ if (get() instanceof SSLSession se)
+ return HexFormat.of().formatHex(se.getId());
+ return super.toString();
+ }
}
-}
+ /**
+ * This CacheEntry type allows multiple V entries to be stored in
+ * one key in the cacheMap.
+ *
+ * This implementation is need for TLS clients that receive multiple
+ * PSKs or NewSessionTickets for server resumption.
+ */
+ private static class QueueCacheEntry implements CacheEntry {
+
+ // Limit the number of queue entries.
+ private final int MAXQUEUESIZE;
+
+ final boolean DEBUG = false;
+ private K key;
+ private long expirationTime;
+ final Queue> queue = new ConcurrentLinkedQueue<>();
+
+ QueueCacheEntry(K key, CacheEntry entry, long expirationTime,
+ int maxSize) {
+ this.key = key;
+ this.expirationTime = expirationTime;
+ this.MAXQUEUESIZE = maxSize;
+ queue.add(entry);
+ }
+
+ public K getKey() {
+ return key;
+ }
+
+ public V getValue() {
+ return getValue(0);
+ }
+
+ public V getValue(long lifetime) {
+ long time = (lifetime == 0) ? 0 : System.currentTimeMillis();
+ do {
+ var entry = queue.poll();
+ if (entry == null) {
+ return null;
+ }
+ if (entry.isValid(time)) {
+ return entry.getValue();
+ }
+ entry.invalidate();
+ } while (!queue.isEmpty());
+
+ return null;
+ }
+
+ public long getExpirationTime() {
+ return expirationTime;
+ }
+
+ public void setExpirationTime(long time) {
+ expirationTime = time;
+ }
+
+ public void putValue(CacheEntry entry) {
+ if (DEBUG) {
+ System.out.println("Added to queue (size=" + queue.size() +
+ "): " + entry.getKey().toString() + ", " + entry);
+ }
+ // Update the cache entry's expiration time to the latest entry.
+ // The getValue() calls will remove expired tickets.
+ expirationTime = entry.getExpirationTime();
+ // Limit the number of queue entries, removing the oldest.
+ if (queue.size() >= MAXQUEUESIZE) {
+ queue.remove();
+ }
+ queue.add(entry);
+ }
+
+ public boolean isValid(long currentTime) {
+ boolean valid = (currentTime <= expirationTime) && !queue.isEmpty();
+ if (!valid) {
+ invalidate();
+ }
+ return valid;
+ }
+
+ public boolean isValid() {
+ return isValid(System.currentTimeMillis());
+ }
+
+ public void invalidate() {
+ clear();
+ key = null;
+ expirationTime = -1;
+ }
+
+ public void clear() {
+ queue.forEach(CacheEntry::invalidate);
+ queue.clear();
+ }
+
+ public boolean isEmpty() {
+ return queue.isEmpty();
+ }
+
+ public Queue> getQueue() {
+ return queue;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/java.base/share/classes/sun/util/locale/BaseLocale.java b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
index ec2a6a49183ca..a744b6ce39f59 100644
--- a/src/java.base/share/classes/sun/util/locale/BaseLocale.java
+++ b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
@@ -38,7 +38,6 @@
import jdk.internal.vm.annotation.Stable;
import java.util.StringJoiner;
-import java.util.function.UnaryOperator;
public final class BaseLocale {
@@ -91,10 +90,6 @@ public final class BaseLocale {
}
}
- // Interned BaseLocale cache
- private static final ReferencedKeySet CACHE =
- ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
-
public static final String SEP = "_";
private final String language;
@@ -163,21 +158,16 @@ public static BaseLocale getInstance(String language, String script,
// Obtain the "interned" BaseLocale from the cache. The returned
// "interned" instance can subsequently be used by the Locale
// instance which guarantees the locale components are properly cased/interned.
- return CACHE.intern(new BaseLocale(language, script, region, variant),
- // Avoid lambdas since this may be on the bootstrap path in many locales
- INTERNER);
- }
-
- public static final UnaryOperator INTERNER = new UnaryOperator<>() {
- @Override
- public BaseLocale apply(BaseLocale b) {
- return new BaseLocale(
- LocaleUtils.toLowerString(b.language).intern(),
- LocaleUtils.toTitleString(b.script).intern(),
- LocaleUtils.toUpperString(b.region).intern(),
- b.variant.intern());
+ class InterningCache { // TODO: StableValue
+ private static final ReferencedKeySet CACHE =
+ ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
}
- };
+ return InterningCache.CACHE.intern(new BaseLocale(
+ language.intern(), // guaranteed to be lower-case
+ LocaleUtils.toTitleString(script).intern(),
+ region.intern(), // guaranteed to be upper-case
+ variant.intern()));
+ }
public static String convertOldISOCodes(String language) {
return switch (language) {
diff --git a/src/java.base/share/man/java.1 b/src/java.base/share/man/java.1
index 133710abc25db..5896a07304375 100644
--- a/src/java.base/share/man/java.1
+++ b/src/java.base/share/man/java.1
@@ -552,15 +552,45 @@ of the release.
Native access involves access to code or data outside the Java runtime.
This is generally unsafe and, if done incorrectly, might crash the JVM
or result in memory corruption.
-Methods that provide native access are restricted, and by default their
-use causes warnings.
-This option allows code in the specified modules to use restricted
-methods without warnings.
-\f[I]module\f[R] can be \f[V]ALL-UNNAMED\f[R] to indicate code on the
-class path.
-When this option is present, any use of restricted methods by code
-outside the specified modules causes an
+Native access can occur as a result of calling a method that is either
+\f[B]restricted\f[R] [https://openjdk.org/jeps/454#Safety], or
+\f[V]native\f[R].
+This option allows code in the specified modules to perform native
+access.
+Native access occurring in a module that has not been explicitly enabled
+is deemed \f[I]illegal\f[R].
+.RS
+.PP
+\f[I]module\f[R] can be a module name, or \f[V]ALL-UNNAMED\f[R] to
+indicate code on the class path.
+.RE
+.TP
+-\f[V]--illegal-native-access=\f[R]\f[I]parameter\f[R]
+This option specifies a mode for how illegal native access is handled:
+.RS
+.RS
+.PP
+\f[B]Note:\f[R] This option will be removed in a future release.
+.RE
+.IP \[bu] 2
+\f[V]allow\f[R]: This mode allows illegal native access in all modules,
+without any warings.
+.IP \[bu] 2
+\f[V]warn\f[R]: This mode is identical to \f[V]allow\f[R] except that a
+warning message is issued for the first illegal native access found in a
+module.
+This mode is the default for the current JDK but will change in a future
+release.
+.IP \[bu] 2
+\f[V]deny\f[R]: This mode disables illegal native access.
+That is, any illegal native access causes an
\f[V]IllegalCallerException\f[R].
+This mode will become the default in a future release.
+.PP
+To verify that your application is ready for a future version of the
+JDK, run it with \f[V]--illegal-native-access=deny\f[R] along with any
+necessary \f[V]--enable-native-access\f[R] options.
+.RE
.TP
\f[V]--finalization=\f[R]\f[I]value\f[R]
Controls whether the JVM performs finalization of objects.
diff --git a/src/java.base/share/native/libzip/Inflater.c b/src/java.base/share/native/libzip/Inflater.c
index a41e9775bfa02..1f43d3d1abf56 100644
--- a/src/java.base/share/native/libzip/Inflater.c
+++ b/src/java.base/share/native/libzip/Inflater.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -49,8 +49,8 @@ JNIEXPORT void JNICALL
Java_java_util_zip_Inflater_initIDs(JNIEnv *env, jclass cls)
{
inputConsumedID = (*env)->GetFieldID(env, cls, "inputConsumed", "I");
- outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");
CHECK_NULL(inputConsumedID);
+ outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");
CHECK_NULL(outputConsumedID);
}
diff --git a/src/java.base/unix/classes/sun/nio/ch/FileKey.java b/src/java.base/unix/classes/sun/nio/ch/FileKey.java
index e60e63f073d22..119abe4a3b57a 100644
--- a/src/java.base/unix/classes/sun/nio/ch/FileKey.java
+++ b/src/java.base/unix/classes/sun/nio/ch/FileKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -33,15 +33,18 @@
*/
public class FileKey {
- private long st_dev; // ID of device
- private long st_ino; // Inode number
+ private final long st_dev; // ID of device
+ private final long st_ino; // Inode number
- private FileKey() { }
+ private FileKey(long st_dev, long st_ino) {
+ this.st_dev = st_dev;
+ this.st_ino = st_ino;
+ }
public static FileKey create(FileDescriptor fd) throws IOException {
- FileKey fk = new FileKey();
- fk.init(fd);
- return fk;
+ long finfo[] = new long[2];
+ init(fd, finfo);
+ return new FileKey(finfo[0], finfo[1]);
}
@Override
@@ -59,10 +62,10 @@ public boolean equals(Object obj) {
&& (this.st_ino == other.st_ino);
}
- private native void init(FileDescriptor fd) throws IOException;
- private static native void initIDs();
+ private static native void init(FileDescriptor fd, long[] finfo)
+ throws IOException;
static {
- initIDs();
+ IOUtil.load();
}
}
diff --git a/src/java.base/unix/native/libnio/ch/FileKey.c b/src/java.base/unix/native/libnio/ch/FileKey.c
index c3817003b5b16..59a866bcaff3a 100644
--- a/src/java.base/unix/native/libnio/ch/FileKey.c
+++ b/src/java.base/unix/native/libnio/ch/FileKey.c
@@ -30,29 +30,21 @@
#include "nio_util.h"
#include "sun_nio_ch_FileKey.h"
-static jfieldID key_st_dev; /* id for FileKey.st_dev */
-static jfieldID key_st_ino; /* id for FileKey.st_ino */
-
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_FileKey_initIDs(JNIEnv *env, jclass clazz)
-{
- CHECK_NULL(key_st_dev = (*env)->GetFieldID(env, clazz, "st_dev", "J"));
- CHECK_NULL(key_st_ino = (*env)->GetFieldID(env, clazz, "st_ino", "J"));
-}
-
-
JNIEXPORT void JNICALL
-Java_sun_nio_ch_FileKey_init(JNIEnv *env, jobject this, jobject fdo)
+Java_sun_nio_ch_FileKey_init(JNIEnv* env, jclass clazz, jobject fdo,
+ jlongArray finfo)
{
struct stat fbuf;
int res;
+ jlong deviceAndInode[2];
- RESTARTABLE(fstat(fdval(env, fdo), &fbuf), res);
+ int fd = fdval(env, fdo);
+ RESTARTABLE(fstat(fd, &fbuf), res);
if (res < 0) {
JNU_ThrowIOExceptionWithLastError(env, "fstat failed");
} else {
- (*env)->SetLongField(env, this, key_st_dev, (jlong)fbuf.st_dev);
- (*env)->SetLongField(env, this, key_st_ino, (jlong)fbuf.st_ino);
+ deviceAndInode[0] = (jlong)fbuf.st_dev;
+ deviceAndInode[1] = (jlong)fbuf.st_ino;
+ (*env)->SetLongArrayRegion(env, finfo, 0, 2, deviceAndInode);
}
}
diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
index 13fe39c6551b9..b91ab6f0cab92 100644
--- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
+++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
@@ -133,9 +133,10 @@ struct my_statx
#define STATX_BTIME 0x00000800U
#endif
-#ifndef STATX_ALL
-#define STATX_ALL (STATX_BTIME | STATX_BASIC_STATS)
-#endif
+//
+// STATX_ALL is deprecated; use a different name to avoid confusion.
+//
+#define LOCAL_STATX_ALL (STATX_BASIC_STATS | STATX_BTIME)
#ifndef AT_FDCWD
#define AT_FDCWD -100
@@ -619,8 +620,19 @@ static void copy_statx_attributes(JNIEnv* env, struct my_statx* buf, jobject att
(*env)->SetLongField(env, attrs, attrs_st_atime_sec, (jlong)buf->stx_atime.tv_sec);
(*env)->SetLongField(env, attrs, attrs_st_mtime_sec, (jlong)buf->stx_mtime.tv_sec);
(*env)->SetLongField(env, attrs, attrs_st_ctime_sec, (jlong)buf->stx_ctime.tv_sec);
- (*env)->SetLongField(env, attrs, attrs_st_birthtime_sec, (jlong)buf->stx_btime.tv_sec);
- (*env)->SetLongField(env, attrs, attrs_st_birthtime_nsec, (jlong)buf->stx_btime.tv_nsec);
+ if ((buf->stx_mask & STATX_BTIME) != 0) {
+ // Birth time was filled in so use it
+ (*env)->SetLongField(env, attrs, attrs_st_birthtime_sec,
+ (jlong)buf->stx_btime.tv_sec);
+ (*env)->SetLongField(env, attrs, attrs_st_birthtime_nsec,
+ (jlong)buf->stx_btime.tv_nsec);
+ } else {
+ // Birth time was not filled in: fall back to last modification time
+ (*env)->SetLongField(env, attrs, attrs_st_birthtime_sec,
+ (jlong)buf->stx_mtime.tv_sec);
+ (*env)->SetLongField(env, attrs, attrs_st_birthtime_nsec,
+ (jlong)buf->stx_mtime.tv_nsec);
+ }
(*env)->SetLongField(env, attrs, attrs_st_atime_nsec, (jlong)buf->stx_atime.tv_nsec);
(*env)->SetLongField(env, attrs, attrs_st_mtime_nsec, (jlong)buf->stx_mtime.tv_nsec);
(*env)->SetLongField(env, attrs, attrs_st_ctime_nsec, (jlong)buf->stx_ctime.tv_nsec);
@@ -674,7 +686,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_stat0(JNIEnv* env, jclass this,
#if defined(__linux__)
struct my_statx statx_buf;
int flags = AT_STATX_SYNC_AS_STAT;
- unsigned int mask = STATX_ALL;
+ unsigned int mask = LOCAL_STATX_ALL;
if (my_statx_func != NULL) {
// Prefer statx over stat on Linux if it's available
@@ -706,7 +718,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_lstat0(JNIEnv* env, jclass this,
#if defined(__linux__)
struct my_statx statx_buf;
int flags = AT_STATX_SYNC_AS_STAT | AT_SYMLINK_NOFOLLOW;
- unsigned int mask = STATX_ALL;
+ unsigned int mask = LOCAL_STATX_ALL;
if (my_statx_func != NULL) {
// Prefer statx over stat on Linux if it's available
@@ -737,7 +749,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_fstat0(JNIEnv* env, jclass this, jint fd,
#if defined(__linux__)
struct my_statx statx_buf;
int flags = AT_EMPTY_PATH | AT_STATX_SYNC_AS_STAT;
- unsigned int mask = STATX_ALL;
+ unsigned int mask = LOCAL_STATX_ALL;
if (my_statx_func != NULL) {
// statx supports FD use via dirfd iff pathname is an empty string and the
@@ -770,7 +782,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_fstatat0(JNIEnv* env, jclass this, jint dfd
#if defined(__linux__)
struct my_statx statx_buf;
int flags = AT_STATX_SYNC_AS_STAT;
- unsigned int mask = STATX_ALL;
+ unsigned int mask = LOCAL_STATX_ALL;
if (my_statx_func != NULL) {
// Prefer statx over stat on Linux if it's available
diff --git a/src/java.base/windows/classes/sun/nio/ch/FileKey.java b/src/java.base/windows/classes/sun/nio/ch/FileKey.java
index 8669517f0c581..a900c382e6895 100644
--- a/src/java.base/windows/classes/sun/nio/ch/FileKey.java
+++ b/src/java.base/windows/classes/sun/nio/ch/FileKey.java
@@ -33,16 +33,21 @@
*/
public class FileKey {
- private int dwVolumeSerialNumber;
- private int nFileIndexHigh;
- private int nFileIndexLow;
+ private final int dwVolumeSerialNumber;
+ private final int nFileIndexHigh;
+ private final int nFileIndexLow;
- private FileKey() { }
+ private FileKey(int dwVolumeSerialNumber, int nFileIndexHigh,
+ int nFileIndexLow) {
+ this.dwVolumeSerialNumber = dwVolumeSerialNumber;
+ this.nFileIndexHigh = nFileIndexHigh;
+ this.nFileIndexLow = nFileIndexLow;
+ }
public static FileKey create(FileDescriptor fd) throws IOException {
- FileKey fk = new FileKey();
- fk.init(fd);
- return fk;
+ int finfo[] = new int[3];
+ init(fd, finfo);
+ return new FileKey(finfo[0], finfo[1], finfo[2]);
}
@Override
@@ -60,11 +65,10 @@ public boolean equals(Object obj) {
&& this.nFileIndexLow == other.nFileIndexLow;
}
- private native void init(FileDescriptor fd) throws IOException;
- private static native void initIDs();
+ private static native void init(FileDescriptor fd, int[] finfo)
+ throws IOException;
static {
IOUtil.load();
- initIDs();
}
}
diff --git a/src/java.base/windows/native/libjli/cmdtoargs.c b/src/java.base/windows/native/libjli/cmdtoargs.c
index 548e70b9bbf7e..27a28b4cd450e 100644
--- a/src/java.base/windows/native/libjli/cmdtoargs.c
+++ b/src/java.base/windows/native/libjli/cmdtoargs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -328,7 +328,7 @@ class Vector {
printf("*** cannot allocate memory\n");
doabort();
}
- _snprintf(cptr, MAX_PATH, "\"%s\" %s", argv[0], cmdline);
+ snprintf(cptr, MAX_PATH, "\"%s\" %s", argv[0], cmdline);
JLI_CmdToArgs(cptr);
free(cptr);
StdArg *kargv = JLI_GetStdArgs();
diff --git a/src/java.base/windows/native/libnio/ch/FileKey.c b/src/java.base/windows/native/libnio/ch/FileKey.c
index 9cd3459aef861..e552ed6b7ae2a 100644
--- a/src/java.base/windows/native/libnio/ch/FileKey.c
+++ b/src/java.base/windows/native/libnio/ch/FileKey.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -30,32 +30,20 @@
#include "nio_util.h"
#include "sun_nio_ch_FileKey.h"
-static jfieldID key_volumeSN; /* id for FileKey.dwVolumeSerialNumber */
-static jfieldID key_indexHigh; /* id for FileKey.nFileIndexHigh */
-static jfieldID key_indexLow; /* id for FileKey.nFileIndexLow */
-
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_FileKey_initIDs(JNIEnv *env, jclass clazz)
-{
- CHECK_NULL(key_volumeSN = (*env)->GetFieldID(env, clazz, "dwVolumeSerialNumber", "I"));
- CHECK_NULL(key_indexHigh = (*env)->GetFieldID(env, clazz, "nFileIndexHigh", "I"));
- CHECK_NULL(key_indexLow = (*env)->GetFieldID(env, clazz, "nFileIndexLow", "I"));
-}
-
-
JNIEXPORT void JNICALL
-Java_sun_nio_ch_FileKey_init(JNIEnv *env, jobject this, jobject fdo)
+Java_sun_nio_ch_FileKey_init(JNIEnv *env, jclass clazz, jobject fdo, jintArray finfo)
{
- HANDLE fileHandle = (HANDLE)(handleval(env, fdo));
+ HANDLE fileHandle = (HANDLE)handleval(env, fdo);
BOOL result;
BY_HANDLE_FILE_INFORMATION fileInfo;
+ jint info[3];
result = GetFileInformationByHandle(fileHandle, &fileInfo);
if (result) {
- (*env)->SetIntField(env, this, key_volumeSN, fileInfo.dwVolumeSerialNumber);
- (*env)->SetIntField(env, this, key_indexHigh, fileInfo.nFileIndexHigh);
- (*env)->SetIntField(env, this, key_indexLow, fileInfo.nFileIndexLow);
+ info[0] = (jint)fileInfo.dwVolumeSerialNumber;
+ info[1] = (jint)fileInfo.nFileIndexHigh;
+ info[2] = (jint)fileInfo.nFileIndexLow;
+ (*env)->SetIntArrayRegion(env, finfo, 0, 3, info);
} else {
JNU_ThrowIOExceptionWithLastError(env, "GetFileInformationByHandle failed");
}
diff --git a/src/java.compiler/share/classes/javax/annotation/processing/Filer.java b/src/java.compiler/share/classes/javax/annotation/processing/Filer.java
index 61af2aae0c7a5..ba9b7ed60ecab 100644
--- a/src/java.compiler/share/classes/javax/annotation/processing/Filer.java
+++ b/src/java.compiler/share/classes/javax/annotation/processing/Filer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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,10 +25,8 @@
package javax.annotation.processing;
-import javax.tools.JavaFileManager;
import javax.tools.*;
import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
import java.io.IOException;
diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
index fd3cb1cb0f8ea..4e32f0cdcd88e 100644
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
@@ -25,10 +25,6 @@
package javax.lang.model;
-import java.util.Collections;
-import java.util.Set;
-import java.util.HashSet;
-
/**
* Source versions of the Java programming language.
*
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/Element.java b/src/java.compiler/share/classes/javax/lang/model/element/Element.java
index 59866114325ae..129dad29020ed 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/Element.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/Element.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,8 +27,6 @@
import java.lang.annotation.Annotation;
-import java.lang.annotation.AnnotationTypeMismatchException;
-import java.lang.annotation.IncompleteAnnotationException;
import java.util.List;
import java.util.Set;
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java b/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
index a8c3b91f8b504..3f34b1799929d 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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 javax.lang.model.element;
-import jdk.internal.javac.PreviewFeature;
-
import java.util.List;
import javax.lang.model.type.*;
import javax.lang.model.util.*;
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java b/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java
index 07e8c25b8f77f..4d2b2582901f8 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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 javax.lang.model.element;
-import jdk.internal.javac.PreviewFeature;
-
import javax.lang.model.util.Elements;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.TypeKind;
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
index e5ab0458f693a..abea88fb6f263 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -28,8 +28,6 @@
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeParameterElement;
-import javax.lang.model.util.Types;
-
/**
* Represents a type variable.
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
index 31d75fe792940..f3f76803e8f43 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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,7 +25,6 @@
package javax.lang.model.type;
-import javax.lang.model.element.*;
import javax.lang.model.util.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
index fed666eb32f44..724ebe593790c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
@@ -28,7 +28,6 @@
import jdk.internal.javac.PreviewFeature;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
index 66a62b7fcb69c..7297e7c0c7b26 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
@@ -29,9 +29,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
-import javax.lang.model.element.RecordComponentElement;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java
index b5b9cfb23b0fc..f802c3bf1b99f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java
@@ -26,7 +26,6 @@
package javax.lang.model.util;
import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.type.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
index c066f1c2f6f4f..823bad0748acd 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
@@ -29,7 +29,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
index 41ad8ffe218fb..764f4e327372c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -28,7 +28,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
import static javax.lang.model.element.ElementKind.*;
import static javax.lang.model.SourceVersion.*;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java
index 4197f53940839..89dcb1f51f33b 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java
@@ -28,7 +28,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
index 7c3a1166e317b..71d5f15fc85b9 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
@@ -30,7 +30,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.*;
-import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
index 03a69516b514f..2f6fb0e03a0d7 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
@@ -30,7 +30,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
index c5bde23b47e1f..bff95313508dd 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.element.ElementVisitor;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java
index 51c78c60067b5..be7fa9908b6bb 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java
@@ -28,7 +28,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
import static javax.lang.model.SourceVersion.*;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
index a9a66d6c18566..d572181b32c73 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
@@ -28,7 +28,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
import static javax.lang.model.SourceVersion.*;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
index 6e21554132a7b..85c30afcf2bc2 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
@@ -27,13 +27,9 @@
import jdk.internal.javac.PreviewFeature;
-import java.util.List;
-import java.util.ArrayList;
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.*;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
index 48182072416c6..c0444c91060a2 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
@@ -29,7 +29,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
index 2e8e27eeff00a..c28b13d4992cb 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -28,7 +28,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
import static javax.lang.model.SourceVersion.*;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
index fcd26dda60d00..3c71f97b67543 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
@@ -28,7 +28,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
index 6acc8f2da48a3..79da686ee0869 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
@@ -29,9 +29,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.ElementVisitor;
-import javax.lang.model.element.RecordComponentElement;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
index ce6321d9fd3fa..9386c02731600 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -29,7 +29,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.type.TypeVisitor;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java
index f47314aeeb24c..c550a76e4b6cd 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java
@@ -29,7 +29,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.type.TypeVisitor;
/**
* A simple visitor of types with default behavior appropriate for the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java
index 8f97b34d547bf..32174be9949bd 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java
@@ -27,7 +27,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.type.IntersectionType;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
index a058f42937a65..1efbe7108370c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
@@ -29,7 +29,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
/**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
index 703ef744edc20..70e0498f5658b 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
@@ -29,7 +29,6 @@
import javax.annotation.processing.SupportedSourceVersion;
import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.SourceVersion;
import javax.lang.model.type.*;
import static javax.lang.model.SourceVersion.*;
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/Types.java b/src/java.compiler/share/classes/javax/lang/model/util/Types.java
index f6296050ca9f5..0cea2734e213c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/Types.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/Types.java
@@ -25,9 +25,6 @@
package javax.lang.model.util;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.AnnotationTypeMismatchException;
-import java.lang.annotation.IncompleteAnnotationException;
import java.util.List;
import javax.lang.model.element.*;
import javax.lang.model.type.*;
diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java
index d481465138b47..6b2dc14c05fc1 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/SystemFlavorMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -61,8 +61,6 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable {
*/
private static String JavaMIME = "JAVA_DATAFLAVOR:";
- private static final Object FLAVOR_MAP_KEY = new Object();
-
/**
* The list of valid, decoded text flavor representation classes, in order
* from best to worst.
diff --git a/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
index 8967a99f15e39..1a77ddd760049 100644
--- a/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
+++ b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
@@ -58,7 +58,7 @@ public class FileManager {
loadOSXLibrary();
}
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
private static void loadOSXLibrary() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java
index 4177e32f63d81..34e5b7c9b7c87 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java
@@ -65,7 +65,7 @@ class AquaFileView extends FileView {
loadOSXUILibrary();
}
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
private static void loadOSXUILibrary() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
index d64ac90e9ac7f..60bb3da9f87db 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
@@ -388,7 +388,9 @@ LateBoundInputMap getTableInputMap() {
"alt shift TAB", "focusHeader",
"F8", "focusHeader",
"ctrl shift UP", "selectFirstRowExtendSelection",
- "ctrl shift DOWN", "selectLastRowExtendSelection"
+ "ctrl shift DOWN", "selectLastRowExtendSelection",
+ "ctrl shift RIGHT", "selectLastColumnExtendSelection",
+ "ctrl shift LEFT", "selectFirstColumnExtendSelection"
}));
}
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
index 83604e5d835cd..9748f9008272f 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
@@ -154,7 +154,7 @@ public boolean isSupportedLookAndFeel() {
* @see #uninitialize
* @see UIManager#setLookAndFeel
*/
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
public void initialize() {
java.security.AccessController.doPrivileged(new PrivilegedAction() {
public Void run() {
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
index 5d6b15671775d..f252e310750c7 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
@@ -41,7 +41,7 @@
import sun.security.action.GetBooleanAction;
// MenuBar implementation for Mac L&F
-@SuppressWarnings("removal")
+@SuppressWarnings({"removal", "restricted"})
public class AquaMenuBarUI extends BasicMenuBarUI implements ScreenMenuBarProvider {
static {
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
index 3e31eca43d0e3..a8abf1a6cd8d0 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
@@ -32,7 +32,7 @@
import com.apple.laf.AquaUtils.RecyclableSingleton;
-@SuppressWarnings("removal")
+@SuppressWarnings({"removal", "restricted"})
public class AquaNativeResources {
static {
java.security.AccessController.doPrivileged(
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java
index b3ec61b5c7913..d8d0928c55fcf 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java
@@ -45,7 +45,7 @@ final class ScreenMenu extends Menu
loadAWTLibrary();
}
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
private static void loadAWTLibrary() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java b/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
index 796dee199ad01..6af002fc04f70 100644
--- a/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
+++ b/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
@@ -30,7 +30,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-@SuppressWarnings("removal")
+@SuppressWarnings({"removal", "restricted"})
public class PlatformGraphicsInfo {
static {
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
index 2da02e34b450f..436ab6138faa4 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
@@ -77,7 +77,7 @@ class CAccessibility implements PropertyChangeListener {
loadAWTLibrary();
}
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
private static void loadAWTLibrary() {
// Need to load the native library for this code.
java.security.AccessController.doPrivileged(
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index d430825bb8565..9a9be0e65c7e4 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -146,7 +146,7 @@ public final class LWCToolkit extends LWToolkit {
static {
System.err.flush();
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
ResourceBundle platformResources = java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
@Override
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
index e2b3b3537ac06..c28759058c086 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
@@ -90,7 +90,7 @@ public class JPEGImageReader extends ImageReader {
initStatic();
}
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
private static void initStatic() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
index 0d41c4d2961ee..39189130be356 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
@@ -175,7 +175,7 @@ public class JPEGImageWriter extends ImageWriter {
initStatic();
}
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
private static void initStatic() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
index 681c0e5195838..a2414da455955 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
@@ -1058,7 +1058,7 @@ public Object createValue(UIDefaults table) {
"KP_RIGHT", "selectNextColumn",
"shift RIGHT", "selectNextColumnExtendSelection",
"shift KP_RIGHT", "selectNextColumnExtendSelection",
- "ctrl shift RIGHT", "selectNextColumnExtendSelection",
+ "ctrl shift RIGHT", "selectLastColumnExtendSelection",
"ctrl shift KP_RIGHT", "selectNextColumnExtendSelection",
"ctrl RIGHT", "selectNextColumnChangeLead",
"ctrl KP_RIGHT", "selectNextColumnChangeLead",
@@ -1066,7 +1066,7 @@ public Object createValue(UIDefaults table) {
"KP_LEFT", "selectPreviousColumn",
"shift LEFT", "selectPreviousColumnExtendSelection",
"shift KP_LEFT", "selectPreviousColumnExtendSelection",
- "ctrl shift LEFT", "selectPreviousColumnExtendSelection",
+ "ctrl shift LEFT", "selectFirstColumnExtendSelection",
"ctrl shift KP_LEFT", "selectPreviousColumnExtendSelection",
"ctrl LEFT", "selectPreviousColumnChangeLead",
"ctrl KP_LEFT", "selectPreviousColumnChangeLead",
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/Platform.java b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
index c4387a2109cc9..727718c6ca90f 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
@@ -74,7 +74,7 @@ static boolean isBigEndian() {
/**
* Load the native library or libraries.
*/
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
private static void loadLibraries() {
// load the native library
isNativeLibLoaded = true;
diff --git a/src/java.desktop/share/classes/java/awt/SplashScreen.java b/src/java.desktop/share/classes/java/awt/SplashScreen.java
index a7939f4a385c5..78ec4ed7aa0e9 100644
--- a/src/java.desktop/share/classes/java/awt/SplashScreen.java
+++ b/src/java.desktop/share/classes/java/awt/SplashScreen.java
@@ -121,7 +121,7 @@ public final class SplashScreen {
* @return the {@link SplashScreen} instance, or {@code null} if there is
* none or it has already been closed
*/
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
public static SplashScreen getSplashScreen() {
synchronized (SplashScreen.class) {
if (GraphicsEnvironment.isHeadless()) {
diff --git a/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java
index 54053fdc2e179..cf6260e9bda21 100644
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -1375,7 +1375,7 @@ private static void setPlatformResources(ResourceBundle bundle) {
* directly. -hung
*/
private static boolean loaded = false;
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
static void loadLibraries() {
if (!loaded) {
java.security.AccessController.doPrivileged(
diff --git a/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java b/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java
index 04414f4fa2f3c..27a2c4397476b 100644
--- a/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java
+++ b/src/java.desktop/share/classes/java/awt/event/NativeLibLoader.java
@@ -52,7 +52,7 @@ class NativeLibLoader {
* For now, we know it's done by the implementation, and we assume
* that the name of the library is "awt". -br.
*/
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
static void loadLibraries() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/src/java.desktop/share/classes/java/awt/image/ColorModel.java b/src/java.desktop/share/classes/java/awt/image/ColorModel.java
index 03ee479951d82..a0aa8fddc10f8 100644
--- a/src/java.desktop/share/classes/java/awt/image/ColorModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/ColorModel.java
@@ -202,7 +202,7 @@ public abstract class ColorModel implements Transparency{
* that the name of the library is "awt". -br.
*/
private static boolean loaded = false;
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
static void loadLibraries() {
if (!loaded) {
java.security.AccessController.doPrivileged(
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
index 188e675388776..119e12276c790 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -394,7 +394,10 @@ public void paint(Graphics g) {
/**
* Messaged when the oneTouchExpandable value of the JSplitPane the
- * divider is contained in changes. Will create the
+ * divider is contained in changes.
+ * If a particular L&F supports this Swing
+ * "SplitPane.supportsOneTouchButtons" property
+ * it will create the
* leftButton and rightButton if they are null
* and corresponding JSplitPane supports oneTouchExpandable property.
* Invalidates the corresponding JSplitPane as well.
diff --git a/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java b/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java
index ef524f0b39aea..868ebdf3699bd 100644
--- a/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java
+++ b/src/java.desktop/share/classes/sun/awt/NativeLibLoader.java
@@ -52,7 +52,7 @@ class NativeLibLoader {
* For now, we know it's done by the implementation, and we assume
* that the name of the library is "awt". -br.
*/
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
static void loadLibraries() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java b/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
index ed09560fc9904..a98e6fc81fbad 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ImagingLib.java
@@ -51,7 +51,7 @@
* (in which case our java code will be executed) or may throw
* an exception.
*/
-@SuppressWarnings("removal")
+@SuppressWarnings({"removal", "restricted"})
public class ImagingLib {
static boolean useLib = true;
diff --git a/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java
index eb28029589770..b976a716deda8 100644
--- a/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java
+++ b/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java
@@ -42,7 +42,7 @@
*
* @author Jim Graham
*/
-@SuppressWarnings("removal")
+@SuppressWarnings({"removal", "restricted"})
public class JPEGImageDecoder extends ImageDecoder {
private static ColorModel RGBcolormodel;
private static ColorModel ARGBcolormodel;
diff --git a/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java b/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java
index 3cf7f1ba5ef0c..e1fe5658e6377 100644
--- a/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java
+++ b/src/java.desktop/share/classes/sun/awt/image/NativeLibLoader.java
@@ -52,7 +52,7 @@ class NativeLibLoader {
* For now, we know it's done by the implementation, and we assume
* that the name of the library is "awt". -br.
*/
- @SuppressWarnings("removal")
+ @SuppressWarnings({"removal", "restricted"})
static void loadLibraries() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java b/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
index ede2d0348b7f6..9439f6ed8574a 100644
--- a/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
+++ b/src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java
@@ -27,7 +27,7 @@
import sun.awt.OSInfo;
-@SuppressWarnings("removal")
+@SuppressWarnings({"removal", "restricted"})
public class FontManagerNativeLibrary {
static {
java.security.AccessController.doPrivileged(
diff --git a/src/java.desktop/share/classes/sun/java2d/Disposer.java b/src/java.desktop/share/classes/sun/java2d/Disposer.java
index 6b152dda3b028..5a80a61604544 100644
--- a/src/java.desktop/share/classes/sun/java2d/Disposer.java
+++ b/src/java.desktop/share/classes/sun/java2d/Disposer.java
@@ -50,7 +50,7 @@
*
* @see DisposerRecord
*/
-@SuppressWarnings("removal")
+@SuppressWarnings({"removal", "restricted"})
public class Disposer implements Runnable {
private static final ReferenceQueue