Merge pull request #22465 from JasonFengJ9/jdk26access · eclipse-openj9/openj9@a8f39d3

@@ -383,6 +383,7 @@ public boolean isReflectivelyExported(Module fromModule, String pkg, Module toMo

383383

/*[ENDIF] JAVA_SPEC_VERSION >= 9 */

384384385385

/*[IF JAVA_SPEC_VERSION >= 10]*/

386+

/*[IF (JAVA_SPEC_VERSION < 26) | INLINE-TYPES]*/

386387

public String newStringUTF8NoRepl(byte[] bytes, int offset, int length) {

387388

/*[IF JAVA_SPEC_VERSION < 17]*/

388389

return StringCoding.newStringUTF8NoRepl(bytes, offset, length);

@@ -394,6 +395,8 @@ public String newStringUTF8NoRepl(byte[] bytes, int offset, int length) {

394395

/*[ENDIF] JAVA_SPEC_VERSION < 21 */

395396

/*[ENDIF] JAVA_SPEC_VERSION < 17 */

396397

}

398+

/*[ENDIF] (JAVA_SPEC_VERSION < 26) | INLINE-TYPES */

399+397400

public byte[] getBytesUTF8NoRepl(String str) {

398401

/*[IF JAVA_SPEC_VERSION < 17]*/

399402

return StringCoding.getBytesUTF8NoRepl(str);

@@ -623,12 +626,16 @@ public void exit(int status) {

623626

}

624627

/*[ENDIF] (JAVA_SPEC_VERSION < 25) | INLINE-TYPES */

625628626-

/*[IF (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES]*/

629+

/*[IF (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES]*/

627630

public int uncheckedEncodeASCII(char[] sa, int sp, byte[] da, int dp, int len) {

628-

/*[ELSE] (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES */

631+

/*[ELSE] (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES */

629632

public int encodeASCII(char[] sa, int sp, byte[] da, int dp, int len) {

630-

/*[ENDIF] (JAVA_SPEC_VERSION >= 25) & !INLINE-TYPES */

633+

/*[ENDIF] (JAVA_SPEC_VERSION == 25) & !INLINE-TYPES */

634+

/*[IF (JAVA_SPEC_VERSION >= 26) & !INLINE-TYPES]*/

635+

return StringCoding.encodeAsciiArray(sa, sp, da, dp, len);

636+

/*[ELSE] (JAVA_SPEC_VERSION >= 26) & !INLINE-TYPES */

631637

return StringCoding.implEncodeAsciiArray(sa, sp, da, dp, len);

638+

/*[ENDIF] (JAVA_SPEC_VERSION >= 26) & !INLINE-TYPES */

632639

}

633640

/*[ENDIF] JAVA_SPEC_VERSION >= 17 */

634641

@@ -931,5 +938,10 @@ public int classFileVersion(Class<?> clazz) {

931938

public int getClassFileAccessFlags(Class<?> clazz) {

932939

return clazz.getClassFileAccessFlags();

933940

}

941+942+

@Override

943+

public String uncheckedNewStringWithLatin1Bytes(byte[] src) {

944+

return String.newStringWithLatin1Bytes(src);

945+

}

934946

/*[ENDIF] (JAVA_SPEC_VERSION >= 26) & !INLINE-TYPES */

935947

}