Skip to content

Commit 32046b3

Browse files
authored
Merge pull request #20131 from JasonFengJ9/jdk24access
JDK24 adds Access new APIs
2 parents 9226fd3 + f775525 commit 32046b3

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

jcl/src/java.base/share/classes/java/lang/Access.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
/*[ENDIF] JAVA_SPEC_VERSION >= 9 */
8686
import sun.nio.ch.Interruptible;
8787
import sun.reflect.annotation.AnnotationType;
88+
/*[IF (JAVA_SPEC_VERSION >= 24) & !INLINE-TYPES]*/
89+
import jdk.internal.loader.NativeLibraries;
90+
/*[ENDIF] (JAVA_SPEC_VERSION >= 24) & !INLINE-TYPES */
8891

8992
/**
9093
* Helper class to allow privileged access to classes
@@ -829,10 +832,27 @@ public Object stringConcat1(String[] constants) {
829832
return new StringConcatHelper.Concat1(constants);
830833
}
831834

835+
/*[IF !INLINE-TYPES]*/
832836
@Override
833837
public String concat(String prefix, Object value, String suffix) {
834838
return StringConcatHelper.concat(prefix, value, suffix);
835839
}
840+
841+
@Override
842+
public int countNonZeroAscii(String string) {
843+
return StringCoding.countNonZeroAscii(string);
844+
}
845+
846+
@Override
847+
public NativeLibraries nativeLibrariesFor(ClassLoader loader) {
848+
return ClassLoader.nativeLibrariesFor(loader);
849+
}
850+
851+
@Override
852+
public byte stringInitCoder() {
853+
return String.COMPACT_STRINGS ? String.LATIN1 : String.UTF16;
854+
}
855+
/*[ENDIF] !INLINE-TYPES */
836856
/*[ENDIF] JAVA_SPEC_VERSION >= 24 */
837857

838858
/*[ENDIF] JAVA_SPEC_VERSION >= 9 */

jcl/src/java.base/share/classes/java/lang/ClassLoader.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2587,4 +2587,10 @@ static void checkClassLoaderPermission(ClassLoader classLoader, Class<?> caller)
25872587
}
25882588
}
25892589
/*[ENDIF] JAVA_SPEC_VERSION >= 19 */
2590+
2591+
/*[IF JAVA_SPEC_VERSION >= 24]*/
2592+
static NativeLibraries nativeLibrariesFor(ClassLoader loader) {
2593+
return (loader == null) ? BootLoader.getNativeLibraries() : loader.nativelibs;
2594+
}
2595+
/*[ENDIF] JAVA_SPEC_VERSION >= 24 */
25902596
}

0 commit comments

Comments
 (0)