Merge pull request #22072 from JasonFengJ9/jdk26access

keithc-ca · web-flow · commit abffac3df363 · 2025-06-10T16:07:36.000-04:00
JDK26 JavaLangAccess adds decodeASCII(), removes uncheckedDecodeASCII()
diff --git a/jcl/src/java.base/share/classes/java/lang/Access.java b/jcl/src/java.base/share/classes/java/lang/Access.java
@@ -494,19 +494,19 @@ public void addExports(Module fromModule, String pkg) {
 /*[ENDIF] JAVA_SPEC_VERSION >= 16 */
 
 /*[IF JAVA_SPEC_VERSION >= 17]*/
-	/*[IF (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES]*/
+	/*[IF (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES]*/
 	public int uncheckedDecodeASCII(byte[] srcBytes, int srcPos, char[] dstChars, int dstPos, int length) {
-	/*[ELSE] (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES */
+	/*[ELSE] (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES */
 	public int decodeASCII(byte[] srcBytes, int srcPos, char[] dstChars, int dstPos, int length) {
-	/*[ENDIF] (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES */
+	/*[ENDIF] (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES */
 		return String.decodeASCII(srcBytes, srcPos, dstChars, dstPos, length);
 	}
 
-	/*[IF (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES]*/
+	/*[IF (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES]*/
 	public void uncheckedInflateBytesToChars(byte[] srcBytes, int srcOffset, char[] dstChars, int dstOffset, int length) {
-	/*[ELSE] (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES */
+	/*[ELSE] (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES */
 	public void inflateBytesToChars(byte[] srcBytes, int srcOffset, char[] dstChars, int dstOffset, int length) {
-	/*[ENDIF] (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES */
+	/*[ENDIF] (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES */
 		StringLatin1.inflate(srcBytes, srcOffset, dstChars, dstOffset, length);
 	}
 
@@ -702,11 +702,11 @@ public char getUTF16Char(byte[] val, int index) {
 		return StringUTF16.getChar(val, index);
 	}
 
-	/*[IF (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES]*/
+	/*[IF (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES]*/
 	public int uncheckedCountPositives(byte[] ba, int off, int len) {
-	/*[ELSE] (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES */
+	/*[ELSE] (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES */
 	public int countPositives(byte[] ba, int off, int len) {
-	/*[ENDIF] (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES */
+	/*[ENDIF] (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES */
 		return StringCoding.countPositives(ba, off, len);
 	}
 
