Refactor CustomHostedOptions to ProvidedHostedOptions

Author: olpaw

substratevm/mx.substratevm/macro-svmjdwp.properties

@@ -1,9 +1,9 @@
 # This file contains support for building images with JDWP debugging support
 
-CustomHostedOptions = JDWP CopyNativeJDWPLibrary
+ProvidedHostedOptions = JDWP CopyNativeJDWPLibrary
 
 ImageBuilderModulePath = ${.}/builder/svm-jdwp-common.jar:${.}/builder/svm-jdwp-resident.jar
 
 Args = -H:+UnlockExperimentalVMOptions \
        -H:+JDWP \
-       -H:-UnlockExperimentalVMOptions
+       -H:-UnlockExperimentalVMOptions

substratevm/mx.substratevm/macro-truffle.properties

@@ -50,7 +50,7 @@ JavaArgs = -Dtruffle.TruffleRuntime=com.oracle.svm.truffle.api.SubstrateTruffleR
            --add-exports org.graalvm.truffle/com.oracle.truffle.object.basic=ALL-UNNAMED \
            --add-exports org.graalvm.truffle/com.oracle.truffle.polyglot=ALL-UNNAMED
 
-CustomHostedOptions = \
+ProvidedHostedOptions = \
   PrintStaticTruffleBoundaries \
   TruffleCheckNeverPartOfCompilation \
   TruffleCheckFrameImplementation \

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java

@@ -96,6 +96,9 @@ record PathsOptionInfo(String delimiter, BundleMember.Role role) {
     record HostedOptionInfo(Boolean isStable, Boolean isBoolean) {
     }
 
+    private final HostedOptionInfo injectedKnownHostedRegularOptionInfo = new HostedOptionInfo(false, false);
+    private final HostedOptionInfo injectedKnownHostedBooleanOptionInfo = new HostedOptionInfo(false, true);
+
     private final Map<String, HostedOptionInfo> allOptionNames;
 
     private int numberOfActiveUnlockExperimentalVMOptions = 0;
@@ -287,10 +290,17 @@ private static String startLowerCase(String str) {
         return str.substring(0, 1).toLowerCase(Locale.ROOT) + str.substring(1);
     }
 
-    private final HostedOptionInfo injectedKnownHostedOptionInfo = new HostedOptionInfo(false, false);
-
     void injectKnownHostedOption(String optionName) {
-        allOptionNames.put(optionName, injectedKnownHostedOptionInfo);
+        String baseOptionName;
+        HostedOptionInfo optionInfo;
+        if (optionName.endsWith("=")) {
+            baseOptionName = optionName.substring(0, optionName.length() - 1);
+            optionInfo = injectedKnownHostedRegularOptionInfo;
+        } else {
+            baseOptionName = optionName;
+            optionInfo = injectedKnownHostedBooleanOptionInfo;
+        }
+        allOptionNames.put(baseOptionName, optionInfo);
     }
 
     @Override

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/MacroOptionHandler.java

@@ -98,7 +98,7 @@ private void applyEnabled(MacroOption.EnabledOption enabledOption, String argume
         }
 
         enabledOption.forEachPropertyValue(config,
-                        "CustomHostedOptions", nativeImage.apiOptionHandler::injectKnownHostedOption, NativeImage.MANY_SPACES_REGEX);
+                        "ProvidedHostedOptions", nativeImage.apiOptionHandler::injectKnownHostedOption, NativeImage.MANY_SPACES_REGEX);
         enabledOption.forEachPropertyValue(config,
                         "ImageProvidedJars", entry -> nativeImage.addImageProvidedJars(Path.of(entry)), PATH_SEPARATOR_REGEX);
         enabledOption.forEachPropertyValue(config,

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java

@@ -779,7 +779,7 @@ public boolean processMetaInfResource(Path classpathEntry, Path resourceRoot, Pa
                 }
                 forEachPropertyValue(properties.get("JavaArgs"), NativeImage.this::addImageBuilderJavaArgs, resolver);
                 forEachPropertyValue(properties.get("Args"), args, resolver);
-                forEachPropertyValue(properties.get("CustomHostedOptions"), apiOptionHandler::injectKnownHostedOption, resolver);
+                forEachPropertyValue(properties.get("ProvidedHostedOptions"), apiOptionHandler::injectKnownHostedOption, resolver);
             } else {
                 args.accept(oH(type.optionKey) + resourceRoot.relativize(resourcePath));
             }

substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.junitsupport/com.oracle.svm.junit/native-image.properties

@@ -1,4 +1,4 @@
 Args = --add-reads=org.graalvm.nativeimage.junitsupport=ALL-UNNAMED \
        --link-at-build-time=com.oracle.svm.junit
 
-CustomHostedOptions = TestFile
+ProvidedHostedOptions = TestFile=

substratevm/src/com.oracle.svm.truffle.tck/src/META-INF/native-image/native-image.properties

@@ -19,8 +19,8 @@ JavaArgs = --add-exports org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UN
            --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=ALL-UNNAMED \
            --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED
 
-CustomHostedOptions = \
-  TruffleTCKPermissionsReportFile \
-  TruffleTCKPermissionsExcludeFiles \
-  TruffleTCKPermissionsMaxStackTraceDepth \
-  TruffleTCKPermissionsMaxErrors
+ProvidedHostedOptions = \
+  TruffleTCKPermissionsReportFile= \
+  TruffleTCKPermissionsExcludeFiles= \
+  TruffleTCKPermissionsMaxStackTraceDepth= \
+  TruffleTCKPermissionsMaxErrors=

truffle/src/com.oracle.truffle.runtime/src/META-INF/native-image/org.graalvm.truffle/truffle-runtime/native-image.properties

@@ -7,7 +7,7 @@ Args = --macro:truffle-svm \
 JavaArgs = -Dtruffle.TruffleRuntime=com.oracle.svm.truffle.api.SubstrateTruffleRuntime \
            -Dgraalvm.ForcePolyglotInvalid=false
 
-CustomHostedOptions = \
+ProvidedHostedOptions = \
   PrintStaticTruffleBoundaries \
   TruffleCheckNeverPartOfCompilation \
   TruffleCheckFrameImplementation \