Tests for missing metdata exceptions

Author: loicottet

sdk/src/org.graalvm.nativeimage/snapshot.sigtest

@@ -37,6 +37,15 @@ meth public static <%0 extends java.lang.Enum<{%%0}>> {%%0} valueOf(java.lang.Cl
 supr java.lang.Object
 hfds name,ordinal
 
+CLSS public java.lang.Error
+cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
+cons public init()
+cons public init(java.lang.String)
+cons public init(java.lang.String,java.lang.Throwable)
+cons public init(java.lang.Throwable)
+supr java.lang.Throwable
+hfds serialVersionUID
+
 CLSS public java.lang.Exception
 cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
 cons public init()
@@ -222,6 +231,11 @@ meth public abstract void fatalError()
 meth public abstract void flush()
 meth public abstract void log(org.graalvm.nativeimage.c.type.CCharPointer,org.graalvm.word.UnsignedWord)
 
+CLSS public final org.graalvm.nativeimage.MissingReflectionRegistrationError
+cons public init(java.lang.String)
+supr java.lang.Error
+hfds serialVersionUID
+
 CLSS public abstract interface org.graalvm.nativeimage.ObjectHandle
 intf org.graalvm.word.ComparableWord
 

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/metadata/MissingReflectionMetadataException.java renamed to sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/MissingReflectionRegistrationError.java

@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.nativeimage.metadata;
+package org.graalvm.nativeimage;
 
 /**
  * This exception is thrown when a reflective query (such as
@@ -49,10 +49,10 @@
  * a change in the reachability of an element will not cause changes in the behavior of the
  * application).
  */
-public final class MissingReflectionMetadataException extends RuntimeException {
+public final class MissingReflectionRegistrationError extends Error {
     private static final long serialVersionUID = 1L;
 
-    public MissingReflectionMetadataException(String message) {
+    public MissingReflectionRegistrationError(String message) {
         super(message);
     }
 }

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ReflectionRegistry.java

@@ -95,6 +95,14 @@ default void registerAllRecordComponentsQuery(ConfigurationCondition condition,
     default void registerAllPermittedSubclassesQuery(ConfigurationCondition condition, Class<?> clazz) {
     }
 
+    @SuppressWarnings("unused")
+    default void registerAllNestMembersQuery(ConfigurationCondition condition, Class<?> clazz) {
+    }
+
+    @SuppressWarnings("unused")
+    default void registerAllSignersQuery(ConfigurationCondition condition, Class<?> clazz) {
+    }
+
     @SuppressWarnings("unused")
     default void registerClassLookupException(ConfigurationCondition condition, String typeName, Throwable t) {
     }

substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneHost.java

@@ -80,6 +80,10 @@ public void onTypeReachable(AnalysisType type) {
          */
     }
 
+    @Override
+    public void onTypeInstantiated(AnalysisType newValue) {
+    }
+
     @Override
     public GraphBuilderPhase.Instance createGraphBuilderPhase(HostedProviders providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts,
                     IntrinsicContext initialIntrinsicContext) {

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java

@@ -152,6 +152,13 @@ public void checkType(ResolvedJavaType type, AnalysisUniverse universe) {
      */
     public abstract void onTypeReachable(AnalysisType newValue);
 
+    /**
+     * Run initialization tasks for a newly instantiated {@link AnalysisType}.
+     *
+     * @param newValue the type to initialize
+     */
+    public abstract void onTypeInstantiated(AnalysisType newValue);
+
     /**
      * Check if an {@link AnalysisType} is initialized.
      */

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java

@@ -41,10 +41,7 @@
 import java.util.function.Function;
 
 import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
-import org.graalvm.nativeimage.impl.ConfigurationCondition;
-import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
 import org.graalvm.word.WordBase;
 
 import com.oracle.graal.pointsto.BigBang;
@@ -580,9 +577,6 @@ protected void onReachable() {
              * of explicit registration of types for reflection.
              */
             registerAsAllocated("All array types are marked as instantiated eagerly.");
-        } else if (isAnnotation()) {
-            /* getDeclaredMethods is called in the AnnotationType constructor */
-            ImageSingletons.lookup(RuntimeReflectionSupport.class).registerAllDeclaredMethodsQuery(ConfigurationCondition.alwaysTrue(), true, getJavaClass());
         }
         ensureOnTypeReachableTaskDone();
     }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java

@@ -692,6 +692,7 @@ public void onFieldAccessed(AnalysisField field) {
     }
 
     public void onTypeInstantiated(AnalysisType type, UsageKind usage) {
+        hostVM.onTypeInstantiated(type);
         bb.onTypeInstantiated(type, usage);
     }
 

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java

@@ -273,6 +273,14 @@ private static boolean getPermittedSubclasses(JNIEnvironment jni, JNIObjectHandl
         return handleGetClasses(jni, thread, bp, state);
     }
 
+    private static boolean getNestMembers(JNIEnvironment jni, JNIObjectHandle thread, Breakpoint bp, InterceptedState state) {
+        return handleGetClasses(jni, thread, bp, state);
+    }
+
+    private static boolean getSigners(JNIEnvironment jni, JNIObjectHandle thread, Breakpoint bp, InterceptedState state) {
+        return handleGetClasses(jni, thread, bp, state);
+    }
+
     private static boolean handleGetClasses(JNIEnvironment jni, JNIObjectHandle thread, Breakpoint bp, InterceptedState state) {
         JNIObjectHandle callerClass = state.getDirectCallerClass();
         JNIObjectHandle self = getReceiver(thread);
@@ -1769,7 +1777,11 @@ private interface BreakpointHandler {
                     optionalBrk("java/lang/Class", "getRecordComponents", "()[Ljava/lang/reflect/RecordComponent;",
                                     BreakpointInterceptor::getRecordComponents),
                     optionalBrk("java/lang/Class", "getPermittedSubclasses", "()[Ljava/lang/Class;",
-                                    BreakpointInterceptor::getPermittedSubclasses)
+                                    BreakpointInterceptor::getPermittedSubclasses),
+                    optionalBrk("java/lang/Class", "getNestMembers", "()[Ljava/lang/Class;",
+                                    BreakpointInterceptor::getNestMembers),
+                    optionalBrk("java/lang/Class", "getSigners", "()[Ljava/lang/Object;",
+                                    BreakpointInterceptor::getSigners)
     };
 
     private static boolean allocateInstance(JNIEnvironment jni, JNIObjectHandle thread, @SuppressWarnings("unused") Breakpoint bp, InterceptedState state) {

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ConfigurationType.java

@@ -94,6 +94,8 @@ static ConfigurationType copyAndMerge(ConfigurationType type, ConfigurationType
     private boolean allDeclaredClasses;
     private boolean allRecordComponents;
     private boolean allPermittedSubclasses;
+    private boolean allNestMembers;
+    private boolean allSigners;
     private boolean allPublicClasses;
     private boolean allDeclaredFields;
     private boolean allPublicFields;
@@ -269,6 +271,8 @@ private void setFlagsFromOther(ConfigurationType other, BiPredicate<Boolean, Boo
         allDeclaredClasses = flagPredicate.test(allDeclaredClasses, other.allDeclaredClasses);
         allRecordComponents = flagPredicate.test(allRecordComponents, other.allRecordComponents);
         allPermittedSubclasses = flagPredicate.test(allPermittedSubclasses, other.allPermittedSubclasses);
+        allNestMembers = flagPredicate.test(allNestMembers, other.allNestMembers);
+        allSigners = flagPredicate.test(allSigners, other.allSigners);
         allPublicClasses = flagPredicate.test(allPublicClasses, other.allPublicClasses);
         allDeclaredFields = flagPredicate.test(allDeclaredFields, other.allDeclaredFields);
         allPublicFields = flagPredicate.test(allPublicFields, other.allPublicFields);
@@ -284,7 +288,7 @@ private boolean isEmpty() {
     }
 
     private boolean allFlagsFalse() {
-        return !(allDeclaredClasses || allRecordComponents || allPermittedSubclasses || allPublicClasses || allDeclaredFields || allPublicFields ||
+        return !(allDeclaredClasses || allRecordComponents || allPermittedSubclasses || allNestMembers || allSigners || allPublicClasses || allDeclaredFields || allPublicFields ||
                         allDeclaredMethodsAccess != ConfigurationMemberAccessibility.NONE || allPublicMethodsAccess != ConfigurationMemberAccessibility.NONE ||
                         allDeclaredConstructorsAccess != ConfigurationMemberAccessibility.NONE || allPublicConstructorsAccess != ConfigurationMemberAccessibility.NONE);
     }
@@ -377,6 +381,14 @@ public synchronized void setAllPermittedSubclasses() {
         allPermittedSubclasses = true;
     }
 
+    public synchronized void setAllNestMembers() {
+        allNestMembers = true;
+    }
+
+    public synchronized void setAllSigners() {
+        allSigners = true;
+    }
+
     public synchronized void setAllPublicClasses() {
         allPublicClasses = true;
     }
@@ -438,6 +450,8 @@ public synchronized void printJson(JsonWriter writer) throws IOException {
         optionallyPrintJsonBoolean(writer, allDeclaredClasses, "allDeclaredClasses");
         optionallyPrintJsonBoolean(writer, allRecordComponents, "allRecordComponents");
         optionallyPrintJsonBoolean(writer, allPermittedSubclasses, "allPermittedSubclasses");
+        optionallyPrintJsonBoolean(writer, allNestMembers, "allNestMembers");
+        optionallyPrintJsonBoolean(writer, allSigners, "allSigners");
         optionallyPrintJsonBoolean(writer, allPublicClasses, "allPublicClasses");
         optionallyPrintJsonBoolean(writer, allDeclaredMethodsAccess == ConfigurationMemberAccessibility.QUERIED, "queryAllDeclaredMethods");
         optionallyPrintJsonBoolean(writer, allPublicMethodsAccess == ConfigurationMemberAccessibility.QUERIED, "queryAllPublicMethods");
@@ -546,6 +560,14 @@ public static boolean haveAllPermittedSubclasses(ConfigurationType type) {
             return type.allPermittedSubclasses;
         }
 
+        public static boolean haveAllNestMembers(ConfigurationType type) {
+            return type.allNestMembers;
+        }
+
+        public static boolean haveAllSigners(ConfigurationType type) {
+            return type.allSigners;
+        }
+
         public static boolean haveAllPublicClasses(ConfigurationType type) {
             return type.allPublicClasses;
         }

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ParserConfigurationAdapter.java

@@ -113,6 +113,16 @@ public void registerPermittedSubclasses(ConfigurationType type) {
         type.setAllPermittedSubclasses();
     }
 
+    @Override
+    public void registerNestMembers(ConfigurationType type) {
+        type.setAllNestMembers();
+    }
+
+    @Override
+    public void registerSigners(ConfigurationType type) {
+        type.setAllSigners();
+    }
+
     @Override
     public void registerPublicFields(ConfigurationType type) {
         type.setAllPublicFields();