Enable --future-defaults=complete-reflection-types

Author: loicottet

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/LegacyReflectionConfigurationParser.java

@@ -48,13 +48,6 @@ final class LegacyReflectionConfigurationParser<C, T> extends ReflectionConfigur
         super(conditionResolver, delegate, parserOptions);
     }
 
-    @Override
-    protected EnumSet<ConfigurationParserOption> supportedOptions() {
-        EnumSet<ConfigurationParserOption> base = super.supportedOptions();
-        base.add(ConfigurationParserOption.TREAT_ALL_NAME_ENTRIES_AS_TYPE);
-        return base;
-    }
-
     @Override
     public void parseAndRegister(Object json, URI origin) {
         parseClassArray(asList(json, "first level of document must be an array of class descriptors"));
@@ -64,7 +57,7 @@ public void parseAndRegister(Object json, URI origin) {
     protected void parseClass(EconomicMap<String, Object> data) {
         checkAttributes(data, "reflection class descriptor object", List.of(NAME_KEY), OPTIONAL_REFLECT_CONFIG_OBJECT_ATTRS);
 
-        Optional<TypeDescriptorWithOrigin> type = parseName(data, checkOption(ConfigurationParserOption.TREAT_ALL_NAME_ENTRIES_AS_TYPE));
+        Optional<TypeDescriptorWithOrigin> type = parseName(data, true);
         if (type.isEmpty()) {
             return;
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FutureDefaultsOptions.java

@@ -41,6 +41,7 @@
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.util.LogUtils;
 import com.oracle.svm.util.StringUtil;
 
 import jdk.graal.compiler.options.Option;
@@ -79,8 +80,10 @@ public class FutureDefaultsOptions {
 
     private static final String RUN_TIME_INITIALIZE_SECURITY_PROVIDERS = "run-time-initialize-security-providers";
     private static final String RUN_TIME_INITIALIZE_FILE_SYSTEM_PROVIDERS = "run-time-initialize-file-system-providers";
+    private static final List<String> ALL_FUTURE_DEFAULTS = List.of(RUN_TIME_INITIALIZE_FILE_SYSTEM_PROVIDERS, RUN_TIME_INITIALIZE_SECURITY_PROVIDERS);
+
     private static final String COMPLETE_REFLECTION_TYPES = "complete-reflection-types";
-    private static final List<String> ALL_FUTURE_DEFAULTS = List.of(RUN_TIME_INITIALIZE_FILE_SYSTEM_PROVIDERS, RUN_TIME_INITIALIZE_SECURITY_PROVIDERS, COMPLETE_REFLECTION_TYPES);
+    private static final List<String> RETIRED_FUTURE_DEFAULTS = List.of(COMPLETE_REFLECTION_TYPES);
 
     public static final String RUN_TIME_INITIALIZE_FILE_SYSTEM_PROVIDERS_REASON = "Initialize JDK classes at run time (--" + OPTION_NAME + " includes " + RUN_TIME_INITIALIZE_FILE_SYSTEM_PROVIDERS +
                     ")";
@@ -140,6 +143,15 @@ public static void parseAndVerifyOptions() {
                                 getOptionHelpText());
             }
 
+            if (RETIRED_FUTURE_DEFAULTS.contains(value)) {
+                LogUtils.warning("The '%s' option from %s contains the value '%s' which is enabled by default in this GraalVM release (%s) and can be removed.",
+                        SubstrateOptionsParser.commandArgument(FutureDefaults, value),
+                        valueWithOrigin.origin(),
+                        value,
+                        VM.getVersion());
+                return;
+            }
+
             if (!getAllValues().contains(value)) {
                 throw UserError.abort("The '%s' option from %s contains invalid value '%s'. It can only contain: %s.%n%nUsage:%n%n%s",
                                 SubstrateOptionsParser.commandArgument(FutureDefaults, value),
@@ -169,26 +181,31 @@ public static void parseAndVerifyOptions() {
 
         /* Set build-time properties for user features */
         for (String futureDefault : getFutureDefaults()) {
-            System.setProperty(FutureDefaultsOptions.SYSTEM_PROPERTY_PREFIX + futureDefault, Boolean.TRUE.toString());
+            setSystemProperty(futureDefault, true);
         }
+
+        for (String retiredFutureDefault : RETIRED_FUTURE_DEFAULTS) {
+            setSystemProperty(retiredFutureDefault, true);
+        }
+    }
+
+    private static void setSystemProperty(String futureDefault, boolean value) {
+        System.setProperty(FutureDefaultsOptions.SYSTEM_PROPERTY_PREFIX + futureDefault, Boolean.toString(value));
     }
 
     public static Set<String> getFutureDefaults() {
         return Collections.unmodifiableSet(Objects.requireNonNull(futureDefaults, "must be initialized before usage"));
     }
 
-    /**
-     * @see FutureDefaultsOptions#FutureDefaults
-     */
-    public static boolean allFutureDefaults() {
-        return getFutureDefaults().containsAll(ALL_FUTURE_DEFAULTS);
+    public static List<String> getRetiredFutureDefaults() {
+        return RETIRED_FUTURE_DEFAULTS;
     }
 
     /**
      * @see FutureDefaultsOptions#FutureDefaults
      */
-    public static boolean completeReflectionTypes() {
-        return getFutureDefaults().contains(COMPLETE_REFLECTION_TYPES);
+    public static boolean allFutureDefaults() {
+        return getFutureDefaults().containsAll(ALL_FUTURE_DEFAULTS);
     }
 
     /**

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

@@ -41,7 +41,6 @@
 
 import com.oracle.svm.configure.ConfigurationFile;
 import com.oracle.svm.configure.ConfigurationParserOption;
-import com.oracle.svm.core.FutureDefaultsOptions;
 import com.oracle.svm.core.option.AccumulatingLocatableMultiOptionValue;
 import com.oracle.svm.core.option.BundleMember;
 import com.oracle.svm.core.option.HostedOptionKey;
@@ -151,8 +150,8 @@ public static final class Options {
         @Option(help = "Testing flag: the 'typeReachable' condition is treated as typeReached so the semantics of programs can change.")//
         public static final HostedOptionKey<Boolean> TreatAllTypeReachableConditionsAsTypeReached = new HostedOptionKey<>(false);
 
-        @Option(help = "Testing flag: the 'name' is treated as 'type' in reflection configuration.")//
-        public static final HostedOptionKey<Boolean> TreatAllNameEntriesAsType = new HostedOptionKey<>(false);
+        @Option(help = "Deprecated, has no effect.", deprecated = true)//
+        public static final HostedOptionKey<Boolean> TreatAllNameEntriesAsType = new HostedOptionKey<>(true);
 
         @Option(help = "Testing flag: the 'typeReached' condition is always satisfied however it prints the stack trace where it would not be satisfied.")//
         public static final HostedOptionKey<Boolean> TrackUnsatisfiedTypeReachedConditions = new HostedOptionKey<>(false);
@@ -181,9 +180,6 @@ public static EnumSet<ConfigurationParserOption> getConfigurationParserOptions()
             if (TreatAllTypeReachableConditionsAsTypeReached.getValue()) {
                 result.add(ConfigurationParserOption.TREAT_ALL_TYPE_REACHABLE_CONDITIONS_AS_TYPE_REACHED);
             }
-            if (TreatAllNameEntriesAsType.getValue() || FutureDefaultsOptions.completeReflectionTypes()) {
-                result.add(ConfigurationParserOption.TREAT_ALL_NAME_ENTRIES_AS_TYPE);
-            }
             return result;
         }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java

@@ -144,6 +144,9 @@ protected SystemPropertiesSupport() {
         for (String futureDefault : FutureDefaultsOptions.getFutureDefaults()) {
             initializeProperty(FutureDefaultsOptions.SYSTEM_PROPERTY_PREFIX + futureDefault, Boolean.TRUE.toString());
         }
+        for (String futureDefault : FutureDefaultsOptions.getRetiredFutureDefaults()) {
+            initializeProperty(FutureDefaultsOptions.SYSTEM_PROPERTY_PREFIX + futureDefault, Boolean.TRUE.toString());
+        }
 
         ArrayList<LazySystemProperty> lazyProperties = new ArrayList<>();
         lazyProperties.add(new LazySystemProperty(UserSystemProperty.NAME, this::userNameValue));