Skip to content

Commit 7af8424

Browse files
committed
[GR-71152] Remove JNIRuntimeAccess
PullRequest: graal/22522
2 parents 8549ba0 + 20c3686 commit 7af8424

File tree

4 files changed

+8
-69
lines changed

4 files changed

+8
-69
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIRuntimeAccess.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxClientFeature.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
*/
2626
package com.oracle.svm.hosted.jdk;
2727

28+
import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
2829
import org.graalvm.nativeimage.hosted.RuntimeReflection;
2930

3031
import com.oracle.svm.core.VMInspectionOptions;
3132
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
3233
import com.oracle.svm.core.feature.InternalFeature;
3334
import com.oracle.svm.core.jdk.JNIRegistrationUtil;
34-
import com.oracle.svm.core.jni.JNIRuntimeAccess;
3535
import com.oracle.svm.core.util.VMError;
3636
import com.oracle.svm.util.ReflectionUtil;
3737

@@ -53,8 +53,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
5353
}
5454

5555
private static void configureJNI() {
56-
JNIRuntimeAccess.register(Boolean.class);
57-
JNIRuntimeAccess.register(ReflectionUtil.lookupMethod(Boolean.class, "getBoolean", String.class));
56+
RuntimeJNIAccess.register(Boolean.class);
57+
RuntimeJNIAccess.register(ReflectionUtil.lookupMethod(Boolean.class, "getBoolean", String.class));
5858
}
5959

6060
/**

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JmxCommonFeature.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030

3131
import org.graalvm.nativeimage.ImageSingletons;
3232
import org.graalvm.nativeimage.dynamicaccess.AccessCondition;
33+
import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
3334
import org.graalvm.nativeimage.hosted.RuntimeReflection;
3435
import org.graalvm.nativeimage.hosted.RuntimeSerialization;
3536

3637
import com.oracle.svm.core.VMInspectionOptions;
3738
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
3839
import com.oracle.svm.core.feature.InternalFeature;
3940
import com.oracle.svm.hosted.reflect.proxy.ProxyRegistry;
40-
import com.oracle.svm.core.jni.JNIRuntimeAccess;
4141
import com.oracle.svm.util.ReflectionUtil;
4242

4343
@AutomaticallyRegisteredFeature
@@ -183,8 +183,8 @@ private static void configureProxy(BeforeAnalysisAccess access) {
183183
}
184184

185185
private static void configureJNI() {
186-
JNIRuntimeAccess.register(Arrays.class);
187-
JNIRuntimeAccess.register(ReflectionUtil.lookupMethod(Arrays.class, "asList", Object[].class));
186+
RuntimeJNIAccess.register(Arrays.class);
187+
RuntimeJNIAccess.register(ReflectionUtil.lookupMethod(Arrays.class, "asList", Object[].class));
188188
}
189189

190190
/**

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNICallWrapperFeature.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import java.util.List;
2929

3030
import org.graalvm.nativeimage.hosted.Feature;
31+
import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
3132

32-
import com.oracle.svm.core.jni.JNIRuntimeAccess;
3333
import com.oracle.svm.core.jni.access.JNIAccessibleMethod;
3434
import com.oracle.svm.hosted.FeatureImpl.DuringSetupAccessImpl;
3535

@@ -39,7 +39,7 @@
3939
* <p>
4040
* Java-to-native call wrappers are created by {@link JNINativeCallWrapperSubstitutionProcessor}. It
4141
* creates a {@link JNINativeCallWrapperMethod} for each Java method that is declared with the
42-
* {@code native} keyword and that was registered via {@link JNIRuntimeAccess} to be accessible via
42+
* {@code native} keyword and that was registered via {@link RuntimeJNIAccess} to be accessible via
4343
* JNI at runtime. The method provides a graph that performs the native code invocation. This graph
4444
* is visible to the analysis.
4545
* </p>

0 commit comments

Comments
 (0)