svm: move JVMCI dynamicaccess API from svm.hosted to svm.util

Author: zapster

substratevm/mx.substratevm/suite.py

@@ -2305,7 +2305,7 @@
                     "org.graalvm.collections",
                 ],
                 "exports" : [
-                    """com.oracle.svm.util to org.graalvm.nativeimage.pointsto,
+                    """com.oracle.svm.util* to org.graalvm.nativeimage.pointsto,
                            org.graalvm.nativeimage.builder,
                            org.graalvm.nativeimage.configure,
                            org.graalvm.nativeimage.librarysupport,

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIJNIAccess.java renamed to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIJNIAccessImpl.java

@@ -24,60 +24,49 @@
  */
 package com.oracle.svm.hosted.dynamicaccess;
 
-import java.lang.reflect.Executable;
-import java.lang.reflect.Field;
-
 import org.graalvm.nativeimage.dynamicaccess.AccessCondition;
 
 import com.oracle.svm.hosted.JNIAccessImpl;
 import com.oracle.svm.util.OriginalClassProvider;
 import com.oracle.svm.util.OriginalFieldProvider;
 import com.oracle.svm.util.OriginalMethodProvider;
+import com.oracle.svm.util.dynamicaccess.JVMCIJNIAccess;
 
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
-/**
- * Mirror of {@link org.graalvm.nativeimage.dynamicaccess.JNIAccess} using JVMCI types.
- */
-public final class JVMCIJNIAccess {
+public final class JVMCIJNIAccessImpl implements JVMCIJNIAccess {
 
     private final JNIAccessImpl jniInstance;
     private static JVMCIJNIAccess instance;
 
-    private JVMCIJNIAccess() {
+    private JVMCIJNIAccessImpl() {
         jniInstance = JNIAccessImpl.singleton();
     }
 
     public static JVMCIJNIAccess singleton() {
         if (instance == null) {
-            instance = new JVMCIJNIAccess();
+            instance = new JVMCIJNIAccessImpl();
         }
         return instance;
     }
 
-    /**
-     * @see org.graalvm.nativeimage.dynamicaccess.JNIAccess#register(AccessCondition, Class...)
-     */
+    @Override
     public void register(AccessCondition condition, ResolvedJavaType... types) {
         for (ResolvedJavaType type : types) {
             jniInstance.register(condition, OriginalClassProvider.getJavaClass(type));
         }
     }
 
-    /**
-     * @see org.graalvm.nativeimage.dynamicaccess.JNIAccess#register(AccessCondition, Executable...)
-     */
+    @Override
     public void register(AccessCondition condition, ResolvedJavaMethod... methods) {
         for (ResolvedJavaMethod method : methods) {
             jniInstance.register(condition, OriginalMethodProvider.getJavaMethod(method));
         }
     }
 
-    /**
-     * @see org.graalvm.nativeimage.dynamicaccess.JNIAccess#register(AccessCondition, Field...)
-     */
+    @Override
     public void register(AccessCondition condition, ResolvedJavaField... fields) {
         for (ResolvedJavaField field : fields) {
             jniInstance.register(condition, OriginalFieldProvider.getJavaField(field));

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIReflectiveAccess.java renamed to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIReflectiveAccessImpl.java

@@ -24,80 +24,65 @@
  */
 package com.oracle.svm.hosted.dynamicaccess;
 
-import java.lang.reflect.Executable;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.graalvm.nativeimage.dynamicaccess.AccessCondition;
-import org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess;
 
 import com.oracle.svm.hosted.ReflectiveAccessImpl;
 import com.oracle.svm.util.OriginalClassProvider;
 import com.oracle.svm.util.OriginalFieldProvider;
 import com.oracle.svm.util.OriginalMethodProvider;
+import com.oracle.svm.util.dynamicaccess.JVMCIReflectiveAccess;
 
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
-/**
- * Mirror of {@link ReflectiveAccess} using JVMCI types.
- */
-public final class JVMCIReflectiveAccess {
+public final class JVMCIReflectiveAccessImpl implements JVMCIReflectiveAccess {
     private final ReflectiveAccessImpl rdaInstance;
     private static JVMCIReflectiveAccess instance;
 
-    private JVMCIReflectiveAccess() {
+    private JVMCIReflectiveAccessImpl() {
         rdaInstance = ReflectiveAccessImpl.singleton();
     }
 
     public static JVMCIReflectiveAccess singleton() {
         if (instance == null) {
-            instance = new JVMCIReflectiveAccess();
+            instance = new JVMCIReflectiveAccessImpl();
         }
         return instance;
     }
 
-    /**
-     * @see ReflectiveAccess#register(AccessCondition, Class...)
-     */
+    @Override
     public void register(AccessCondition condition, ResolvedJavaType... types) {
         for (ResolvedJavaType type : types) {
             rdaInstance.register(condition, OriginalClassProvider.getJavaClass(type));
         }
     }
 
-    /**
-     * @see ReflectiveAccess#register(AccessCondition, Executable...)
-     */
+    @Override
     public void register(AccessCondition condition, ResolvedJavaMethod... methods) {
         for (ResolvedJavaMethod method : methods) {
             rdaInstance.register(condition, OriginalMethodProvider.getJavaMethod(method));
         }
     }
 
-    /**
-     * @see ReflectiveAccess#register(AccessCondition, Field...)
-     */
+    @Override
     public void register(AccessCondition condition, ResolvedJavaField... fields) {
         for (ResolvedJavaField field : fields) {
             rdaInstance.register(condition, OriginalFieldProvider.getJavaField(field));
         }
     }
 
-    /**
-     * @see ReflectiveAccess#registerForSerialization(AccessCondition, Class...)
-     */
+    @Override
     public void registerForSerialization(AccessCondition condition, ResolvedJavaType... types) {
         for (ResolvedJavaType type : types) {
             rdaInstance.registerForSerialization(condition, OriginalClassProvider.getJavaClass(type));
         }
     }
 
-    /**
-     * @see ReflectiveAccess#registerProxy(AccessCondition, Class...)
-     */
+    @Override
     public Class<?> registerProxy(AccessCondition condition, ResolvedJavaType... interfaces) {
         List<Class<?>> reflectionInterfaces = new ArrayList<>();
         for (ResolvedJavaType intf : interfaces) {
@@ -106,9 +91,7 @@ public Class<?> registerProxy(AccessCondition condition, ResolvedJavaType... int
         return rdaInstance.registerProxy(condition, reflectionInterfaces.toArray(Class[]::new));
     }
 
-    /**
-     * @see ReflectiveAccess#registerForUnsafeAllocation(AccessCondition, Class...)
-     */
+    @Override
     public void registerForUnsafeAllocation(AccessCondition condition, ResolvedJavaType... types) {
         for (ResolvedJavaType type : types) {
             rdaInstance.registerForUnsafeAllocation(condition, OriginalClassProvider.getJavaClass(type));

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIAccessCondition.java renamed to substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/dynamicaccess/JVMCIAccessCondition.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.dynamicaccess;
+package com.oracle.svm.util.dynamicaccess;
 
 import org.graalvm.nativeimage.dynamicaccess.AccessCondition;
 

substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/dynamicaccess/JVMCIJNIAccess.java

@@ -0,0 +1,15 @@
+package com.oracle.svm.util.dynamicaccess;
+
+import org.graalvm.nativeimage.dynamicaccess.AccessCondition;
+
+import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+public interface JVMCIJNIAccess {
+    void register(AccessCondition condition, ResolvedJavaType... types);
+
+    void register(AccessCondition condition, ResolvedJavaMethod... methods);
+
+    void register(AccessCondition condition, ResolvedJavaField... fields);
+}

substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/dynamicaccess/JVMCIReflectiveAccess.java

@@ -0,0 +1,50 @@
+package com.oracle.svm.util.dynamicaccess;
+
+import org.graalvm.nativeimage.dynamicaccess.AccessCondition;
+
+import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+/**
+ * Mirror of org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess using JVMCI types.
+ */
+public interface JVMCIReflectiveAccess {
+    /**
+     * See org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess#register(AccessCondition,
+     * Class...).
+     */
+    void register(AccessCondition condition, ResolvedJavaType... types);
+
+    /**
+     * See org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess#register(AccessCondition,
+     * Executable...).
+     */
+    void register(AccessCondition condition, ResolvedJavaMethod... methods);
+
+    /**
+     * See org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess#register(AccessCondition,
+     * Field...).
+     */
+    void register(AccessCondition condition, ResolvedJavaField... fields);
+
+    /**
+     * See
+     * org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess#registerForSerialization(AccessCondition,
+     * Class...).
+     */
+    void registerForSerialization(AccessCondition condition, ResolvedJavaType... types);
+
+    /**
+     * See org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess#registerProxy(AccessCondition,
+     * Class...).
+     */
+    Class<?> registerProxy(AccessCondition condition, ResolvedJavaType... interfaces);
+
+    /**
+     * See
+     * org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess#registerForUnsafeAllocation(AccessCondition,
+     * Class...).
+     */
+    void registerForUnsafeAllocation(AccessCondition condition, ResolvedJavaType... types);
+}

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIRuntimeJNIAccess.java renamed to substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/dynamicaccess/JVMCIRuntimeJNIAccess.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.dynamicaccess;
+package com.oracle.svm.util.dynamicaccess;
 
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIRuntimeProxyCreation.java renamed to substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/dynamicaccess/JVMCIRuntimeProxyCreation.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.dynamicaccess;
+package com.oracle.svm.util.dynamicaccess;
 
 import java.util.Arrays;
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIRuntimeReflection.java renamed to substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/dynamicaccess/JVMCIRuntimeReflection.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.dynamicaccess;
+package com.oracle.svm.util.dynamicaccess;
 
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dynamicaccess/JVMCIRuntimeSerialization.java renamed to substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/dynamicaccess/JVMCIRuntimeSerialization.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.dynamicaccess;
+package com.oracle.svm.util.dynamicaccess;
 
 import java.util.Arrays;