Add agent support for getPermittedSubclasses

Add minimum java spec check to the agent

Author: lazar-mitrovic

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

@@ -255,6 +255,10 @@ private static boolean getDeclaredClasses(JNIEnvironment jni, Breakpoint bp, Int
         return handleGetClasses(jni, bp, state);
     }
 
+    private static boolean getPermittedSubclasses(JNIEnvironment jni, Breakpoint bp, InterceptedState state) {
+        return handleGetClasses(jni, bp, state);
+    }
+
     private static boolean handleGetClasses(JNIEnvironment jni, Breakpoint bp, InterceptedState state) {
         JNIObjectHandle callerClass = state.getDirectCallerClass();
         JNIObjectHandle self = getObjectArgument(0);
@@ -1295,6 +1299,9 @@ public static void onVMInit(JvmtiEnv jvmti, JNIEnvironment jni) {
             System.arraycopy(REFLECTION_QUERIES_BREAKPOINT_SPECIFICATIONS, 0, breakpointSpecifications, BREAKPOINT_SPECIFICATIONS.length, REFLECTION_QUERIES_BREAKPOINT_SPECIFICATIONS.length);
         }
         for (BreakpointSpecification br : breakpointSpecifications) {
+            if (br == null) {
+                continue;
+            }
             JNIObjectHandle clazz = nullHandle();
             if (lastClassName != null && lastClassName.equals(br.className)) {
                 clazz = lastClass;
@@ -1421,6 +1428,8 @@ private interface BreakpointHandler {
                     brk("java/lang/Class", "getDeclaredFields", "()[Ljava/lang/reflect/Field;", BreakpointInterceptor::getDeclaredFields),
                     brk("java/lang/Class", "getDeclaredClasses", "()[Ljava/lang/Class;", BreakpointInterceptor::getDeclaredClasses),
 
+                    brk("java/lang/Class", "getPermittedSubclasses", "()[Ljava/lang/Class;", BreakpointInterceptor::getPermittedSubclasses, 17),
+
                     brk("java/lang/Class", "getField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;", BreakpointInterceptor::getField),
                     brk("java/lang/Class", "getDeclaredField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;", BreakpointInterceptor::getDeclaredField),
 
@@ -1538,6 +1547,15 @@ private interface BreakpointHandler {
                     brk("java/lang/Class", "getDeclaredConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;", BreakpointInterceptor::getConstructor),
     };
 
+    private static BreakpointSpecification brk(String className, String methodName, String signature, BreakpointHandler handler, double minimumJavaSpec) {
+        double version = Double.parseDouble(System.getProperty("java.specification.version"));
+        if (version >= minimumJavaSpec) {
+            return new BreakpointSpecification(className, methodName, signature, handler, false);
+        } else {
+            return null;
+        }
+    }
+
     private static BreakpointSpecification brk(String className, String methodName, String signature, BreakpointHandler handler) {
         return new BreakpointSpecification(className, methodName, signature, handler, false);
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -74,6 +74,7 @@ static ConfigurationType copyAndSubtract(ConfigurationType type, ConfigurationTy
     private Map<ConfigurationMethod, ConfigurationMemberInfo> methods;
 
     private boolean allDeclaredClasses;
+    private boolean allPermittedSubclasses;
     private boolean allPublicClasses;
     private boolean allDeclaredFields;
     private boolean allPublicFields;
@@ -211,6 +212,7 @@ private void removeMethods(ConfigurationType other) {
     private void setFlagsFromOther(ConfigurationType other, BiPredicate<Boolean, Boolean> flagPredicate,
                     BiFunction<ConfigurationMemberAccessibility, ConfigurationMemberAccessibility, ConfigurationMemberAccessibility> accessCombiner) {
         allDeclaredClasses = flagPredicate.test(allDeclaredClasses, other.allDeclaredClasses);
+        allPermittedSubclasses = flagPredicate.test(allPermittedSubclasses, other.allPermittedSubclasses);
         allPublicClasses = flagPredicate.test(allPublicClasses, other.allPublicClasses);
         allDeclaredFields = flagPredicate.test(allDeclaredFields, other.allDeclaredFields);
         allPublicFields = flagPredicate.test(allPublicFields, other.allPublicFields);
@@ -225,7 +227,7 @@ private boolean isEmpty() {
     }
 
     private boolean allFlagsFalse() {
-        return !(allDeclaredClasses || allPublicClasses || allDeclaredFields || allPublicFields ||
+        return !(allDeclaredClasses || allPermittedSubclasses || allPublicClasses || allDeclaredFields || allPublicFields ||
                         allDeclaredMethodsAccess != ConfigurationMemberAccessibility.NONE || allPublicMethodsAccess != ConfigurationMemberAccessibility.NONE ||
                         allDeclaredConstructorsAccess != ConfigurationMemberAccessibility.NONE || allPublicConstructorsAccess != ConfigurationMemberAccessibility.NONE);
     }
@@ -310,6 +312,10 @@ public synchronized void setAllDeclaredClasses() {
         allDeclaredClasses = true;
     }
 
+    public synchronized void setAllPermittedSubclasses() {
+        allPermittedSubclasses = true;
+    }
+
     public synchronized void setAllPublicClasses() {
         allPublicClasses = true;
     }
@@ -365,6 +371,7 @@ public synchronized void printJson(JsonWriter writer) throws IOException {
         optionallyPrintJsonBoolean(writer, allDeclaredConstructorsAccess == ConfigurationMemberAccessibility.ACCESSED, "allDeclaredConstructors");
         optionallyPrintJsonBoolean(writer, allPublicConstructorsAccess == ConfigurationMemberAccessibility.ACCESSED, "allPublicConstructors");
         optionallyPrintJsonBoolean(writer, allDeclaredClasses, "allDeclaredClasses");
+        optionallyPrintJsonBoolean(writer, allPermittedSubclasses, "allPermittedSubclasses");
         optionallyPrintJsonBoolean(writer, allPublicClasses, "allPublicClasses");
         optionallyPrintJsonBoolean(writer, allDeclaredMethodsAccess == ConfigurationMemberAccessibility.QUERIED, "queryAllDeclaredMethods");
         optionallyPrintJsonBoolean(writer, allPublicMethodsAccess == ConfigurationMemberAccessibility.QUERIED, "queryAllPublicMethods");
@@ -463,6 +470,10 @@ public static boolean haveAllDeclaredClasses(ConfigurationType type) {
             return type.allDeclaredClasses;
         }
 
+        public static boolean haveAllPermittedSubclasses(ConfigurationType type) {
+            return type.allPermittedSubclasses;
+        }
+
         public static boolean haveAllPublicClasses(ConfigurationType type) {
             return type.allPublicClasses;
         }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -98,6 +98,11 @@ public void registerDeclaredClasses(ConfigurationType type) {
         type.setAllDeclaredClasses();
     }
 
+    @Override
+    public void registerPermittedSubclasses(ConfigurationType type) {
+        type.setAllPermittedSubclasses();
+    }
+
     @Override
     public void registerPublicFields(ConfigurationType type) {
         type.setAllPublicFields();

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java

@@ -156,6 +156,10 @@ public void processEntry(Map<String, ?> entry) {
                 configuration.getOrCreateType(condition, clazz).setAllDeclaredClasses();
                 break;
             }
+            case "getPermittedSubclasses": {
+                configuration.getOrCreateType(condition, clazz).setAllPermittedSubclasses();
+                break;
+            }
             case "getClasses": {
                 configuration.getOrCreateType(condition, clazz).setAllPublicClasses();
                 break;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -52,7 +52,7 @@ public final class ReflectionConfigurationParser<T> extends ConfigurationParser
     private final boolean allowIncompleteClasspath;
     private static final List<String> OPTIONAL_REFLECT_CONFIG_OBJECT_ATTRS = Arrays.asList("allDeclaredConstructors", "allPublicConstructors",
                     "allDeclaredMethods", "allPublicMethods", "allDeclaredFields", "allPublicFields",
-                    "allDeclaredClasses", "allPublicClasses", "methods", "queriedMethods", "fields", CONDITIONAL_KEY,
+                    "allDeclaredClasses", "allPermittedSubclasses", "allPublicClasses", "methods", "queriedMethods", "fields", CONDITIONAL_KEY,
                     "queryAllDeclaredConstructors", "queryAllPublicConstructors", "queryAllDeclaredMethods", "queryAllPublicMethods");
 
     public ReflectionConfigurationParser(ReflectionConfigurationParserDelegate<T> delegate) {
@@ -139,6 +139,11 @@ private void parseClass(Map<String, Object> data) {
                             delegate.registerDeclaredClasses(clazz);
                         }
                         break;
+                    case "allPermittedSubclasses":
+                        if (asBoolean(value, "allPermittedSubclasses")) {
+                            delegate.registerPermittedSubclasses(clazz);
+                        }
+                        break;
                     case "allPublicClasses":
                         if (asBoolean(value, "allPublicClasses")) {
                             delegate.registerPublicClasses(clazz);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParserDelegate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -42,6 +42,8 @@ public interface ReflectionConfigurationParserDelegate<T> {
 
     void registerDeclaredClasses(T type);
 
+    void registerPermittedSubclasses(T type);
+
     void registerPublicFields(T type);
 
     void registerDeclaredFields(T type);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java

@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
@@ -107,7 +108,15 @@ public void initializeMetaData(AnalysisType type) {
             /*
              * Support for permitted subclasses of a sealed class.
              */
-            hub.setPermittedSubclasses(SealedClassSupport.singleton().getPermittedSubclasses(type.getJavaClass()));
+            Class<?>[] permitted = SealedClassSupport.singleton().getPermittedSubclasses(type.getJavaClass());
+            if (permitted != null) {
+                hub.setPermittedSubclasses(
+                        Arrays.stream(permitted)
+                                        .filter(clazz -> metaAccess.lookupJavaType(clazz).isReachable())
+                                        .collect(Collectors.toList())
+                                        .toArray(new Class<?>[0])
+                );
+            }
 
             /*
              * Support for Java annotations.

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ReflectionRegistryAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -34,9 +34,9 @@
 import com.oracle.svm.core.TypeResult;
 import com.oracle.svm.core.configure.ConditionalElement;
 import com.oracle.svm.core.configure.ReflectionConfigurationParserDelegate;
+import com.oracle.svm.core.jdk.SealedClassSupport;
 import com.oracle.svm.hosted.ImageClassLoader;
 import com.oracle.svm.util.ClassUtil;
-
 import jdk.vm.ci.meta.MetaUtil;
 
 public class ReflectionRegistryAdapter implements ReflectionConfigurationParserDelegate<ConditionalElement<Class<?>>> {
@@ -87,6 +87,11 @@ public void registerDeclaredClasses(ConditionalElement<Class<?>> type) {
         registry.register(type.getCondition(), type.getElement().getDeclaredClasses());
     }
 
+    @Override
+    public void registerPermittedSubclasses(ConditionalElement<Class<?>> type) {
+        registry.register(type.getCondition(), SealedClassSupport.singleton().getPermittedSubclasses(type.getElement()));
+    }
+
     @Override
     public void registerPublicFields(ConditionalElement<Class<?>> type) {
         registry.register(type.getCondition(), false, type.getElement().getFields());