Move reflection code to com.oracle.svm.{core,hosted}.reflect.

Author: peter-hofer

substratevm/mx.substratevm/suite.py

@@ -677,7 +677,7 @@
                 "resources",
             ],
             "dependencies": [
-                "com.oracle.svm.reflect",
+                "com.oracle.svm.core",
                 "mx:JUNIT_TOOL",
             ],
             "checkstyle": "com.oracle.svm.core",
@@ -753,38 +753,11 @@
             "testProject": True,
         },
 
-        "com.oracle.svm.reflect": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": [
-                "com.oracle.svm.hosted",
-            ],
-            "requiresConcealed" : {
-                "java.base" : [
-                    "sun.invoke.util",
-                    "sun.reflect.annotation",
-                    "sun.reflect.generics.repository",
-                    "jdk.internal.reflect",
-                    "sun.reflect.generics.scope"
-                ],
-                "jdk.internal.vm.ci" : [
-                    "jdk.vm.ci.code",
-                ],
-            },
-            "checkstyle": "com.oracle.svm.core",
-            "workingSets": "SVM",
-            "annotationProcessors": [
-                "compiler:GRAAL_PROCESSOR",
-            ],
-            "javaCompliance": "11+",
-            "spotbugs": "false",
-        },
-
         "com.oracle.svm.methodhandles": {
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
-                "com.oracle.svm.reflect",
+                "com.oracle.svm.hosted",
             ],
             "requiresConcealed" : {
                 "java.base" : [
@@ -1014,8 +987,6 @@
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
-                "com.oracle.svm.core",
-                "com.oracle.svm.reflect",
                 "com.oracle.svm.graal",
                 "compiler:GRAAL"
             ],
@@ -1142,7 +1113,6 @@
                 "com.oracle.svm.core.windows",
                 "com.oracle.svm.core.genscavenge",
                 "com.oracle.svm.core.containers",
-                "com.oracle.svm.reflect",
                 "com.oracle.svm.methodhandles"
             ],
             "manifestEntries" : {
@@ -1170,7 +1140,7 @@
                     "com.oracle.svm.core.graal.nodes              to jdk.internal.vm.compiler",
                     "com.oracle.svm.core.graal.snippets           to jdk.internal.vm.compiler",
                     "com.oracle.svm.hosted.fieldfolding           to jdk.internal.vm.compiler",
-                    "com.oracle.svm.reflect.hosted                to jdk.internal.vm.compiler",
+                    "com.oracle.svm.hosted.reflect                to jdk.internal.vm.compiler",
                 ],
                 "requires": [
                     "java.management",

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/proxy/DynamicProxySupport.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java

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

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/serialize/SerializationRegistry.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationRegistry.java

@@ -23,7 +23,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.reflect.serialize;
+package com.oracle.svm.core.reflect.serialize;
 
 public interface SerializationRegistry {
 

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/serialize/SerializationSupport.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java

@@ -23,7 +23,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.reflect.serialize;
+package com.oracle.svm.core.reflect.serialize;
 
 import java.io.Serializable;
 import java.lang.invoke.SerializedLambda;

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/proxy/hosted/package-info.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/EncodedReflectionMetadataSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package com.oracle.svm.core.reflect.target;
 
-@Platforms(Platform.HOSTED_ONLY.class)
-package com.oracle.svm.reflect.proxy.hosted;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+
+@Platforms(Platform.HOSTED_ONLY.class)
+public interface EncodedReflectionMetadataSupplier {
+    byte[] getAnnotationsEncoding(AccessibleObject object);
+
+    byte[] getParameterAnnotationsEncoding(Executable object);
+
+    byte[] getAnnotationDefaultEncoding(Method object);
+
+    byte[] getTypeAnnotationsEncoding(AccessibleObject object);
+
+    byte[] getReflectParametersEncoding(Executable object);
+}

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ExecutableAccessorComputer.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ExecutableAccessorComputer.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.reflect.hosted;
+package com.oracle.svm.core.reflect.target;
 
 import java.lang.reflect.Executable;
 
@@ -47,6 +47,6 @@ public RecomputeFieldValue.ValueAvailability valueAvailability() {
 
     @Override
     public Object compute(MetaAccessProvider metaAccess, ResolvedJavaField original, ResolvedJavaField annotated, Object receiver) {
-        return ImageSingletons.lookup(ReflectionFeature.class).getOrCreateAccessor((Executable) receiver);
+        return ImageSingletons.lookup(ReflectionSubstitutionSupport.class).getOrCreateAccessor((Executable) receiver);
     }
 }

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/FieldOffsetComputer.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/FieldOffsetComputer.java

@@ -22,15 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.reflect.hosted;
+package com.oracle.svm.core.reflect.target;
 
 import java.lang.reflect.Field;
 
+import org.graalvm.nativeimage.ImageSingletons;
+
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.RecomputeFieldValue.CustomFieldValueComputer;
-import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.meta.HostedField;
-import com.oracle.svm.hosted.meta.HostedMetaAccess;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -44,21 +43,7 @@ public RecomputeFieldValue.ValueAvailability valueAvailability() {
 
     @Override
     public Object compute(MetaAccessProvider metaAccess, ResolvedJavaField original, ResolvedJavaField annotated, Object receiver) {
-        VMError.guarantee(metaAccess instanceof HostedMetaAccess, "Field offset computation must be done during compilation.");
-
-        /*
-         * We have to use `optionalLookupJavaField` as fields are omitted when there is no
-         * reflective access in an image.
-         */
-        HostedField hostedField = ((HostedMetaAccess) metaAccess).optionalLookupJavaField((Field) receiver);
-        if (hostedField != null && hostedField.wrapped.isUnsafeAccessed()) {
-            int location = hostedField.getLocation();
-            VMError.guarantee(location > 0, "Incorrect field location: " + location + " for " + hostedField.format("%H.%n"));
-            return location;
-        } else {
-            /* A value of -1 signals that the field was not marked as unsafe accessed. */
-            return -1;
-        }
+        return ImageSingletons.lookup(ReflectionSubstitutionSupport.class).getFieldOffset((Field) receiver);
     }
 
     @Override

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/ReflectionHelper.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionHelper.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.reflect.target;
+package com.oracle.svm.core.reflect.target;
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.util.VMError;

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionMetadataComputer.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataComputer.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.reflect.hosted;
+package com.oracle.svm.core.reflect.target;
 
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 

substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/ReflectionMetadataDecoderImpl.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataDecoderImpl.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.reflect.target;
+package com.oracle.svm.core.reflect.target;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
@@ -47,13 +47,12 @@
 import com.oracle.svm.core.reflect.ReflectionMetadataDecoder;
 import com.oracle.svm.core.reflect.Target_java_lang_reflect_RecordComponent;
 import com.oracle.svm.core.util.ByteArrayReader;
-import com.oracle.svm.reflect.hosted.ReflectionMetadataEncoderImpl;
 
 /**
  * This class performs the parsing of reflection metadata at runtime. The encoding formats are
  * specified as comments above each parsing method.
  *
- * See {@link ReflectionMetadataEncoderImpl} for details about the emission of the metadata.
+ * See {@code ReflectionMetadataEncoderImpl} for details about the emission of the metadata.
  */
 public class ReflectionMetadataDecoderImpl implements ReflectionMetadataDecoder {
     public static final int NO_METHOD_METADATA = -1;