[GR-35366] Allow stable ProvidedHostedOptions.

PullRequest: graal/21994

Author: olpaw

compiler/mx.compiler/suite.py

@@ -563,6 +563,7 @@
                   org.graalvm.nativeimage.base,
                   org.graalvm.extraimage.builder,
                   org.graalvm.extraimage.librarysupport,
+                  org.graalvm.nativeimage.enterprise.testrunner,
                   com.oracle.svm.extraimage_enterprise,
                   org.graalvm.truffle.runtime.svm,
                   com.oracle.truffle.enterprise.svm""",

substratevm/mx.substratevm/mx_substratevm.py

@@ -88,7 +88,7 @@ def adjusted_exports(line):
 
     return [adjusted_exports(line) for line in compiler_flags[str(version_tag)]]
 
-def classpath(args):
+def classpath(args, extra_excludes=None):
     if not args:
         return [] # safeguard against mx.classpath(None) behaviour
 
@@ -99,7 +99,10 @@ def include_in_excludes(dep, dep_edge):
         if dep.isJavaProject() or dep.isDistribution():
             transitive_excludes.add(dep)
 
-    implicit_excludes_deps = [mx.dependency(entry) for entry in mx_sdk_vm_impl.NativePropertiesBuildTask.implicit_excludes]
+    excludes = mx_sdk_vm_impl.NativePropertiesBuildTask.implicit_excludes
+    if extra_excludes:
+        excludes += extra_excludes
+    implicit_excludes_deps = [mx.dependency(entry) for entry in excludes]
     mx.walk_deps(implicit_excludes_deps, visit=include_in_excludes)
     cpEntries = mx.classpath_entries(names=args, includeSelf=True, preferProjects=False, excludes=transitive_excludes)
     return mx._entries_to_classpath(cpEntries=cpEntries, resolve=True, includeBootClasspath=False, jdk=mx_compiler.jdk, unique=False, ignoreStripped=False)

substratevm/mx.substratevm/suite.py

@@ -1765,6 +1765,7 @@
                             org.graalvm.nativeimage.agent.jvmtibase,
                             org.graalvm.nativeimage.agent.tracing,
                             org.graalvm.nativeimage.agent.diagnostics,
+                            org.graalvm.nativeimage.enterprise.testrunner,
                             com.oracle.svm.svm_enterprise,
                             com.oracle.svm.svm_enterprise.llvm,
                             com.oracle.svm_enterprise.ml_dataset,
@@ -1926,7 +1927,7 @@
 
         "JUNIT_SUPPORT": {
             "subDir": "src",
-            "description" : "SubstrateVM suppoprt for building JUnit test into image",
+            "description" : "SubstrateVM support for building JUnit test into image",
             "dependencies": [
                 "com.oracle.svm.junit",
             ],

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

@@ -97,8 +97,8 @@ 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 HostedOptionInfo[] injectedKnownHostedRegularOptionInfo = {new HostedOptionInfo(true, false), new HostedOptionInfo(false, false)};
+    private final HostedOptionInfo[] injectedKnownHostedBooleanOptionInfo = {new HostedOptionInfo(true, true), new HostedOptionInfo(false, true)};
 
     private final Map<String, HostedOptionInfo> allOptionNames;
 
@@ -295,16 +295,23 @@ private static String startLowerCase(String str) {
     }
 
     void injectKnownHostedOption(String optionName) {
+        int variant;
         String baseOptionName;
-        HostedOptionInfo optionInfo;
-        if (optionName.endsWith("=")) {
-            baseOptionName = optionName.substring(0, optionName.length() - 1);
-            optionInfo = injectedKnownHostedRegularOptionInfo;
+        if (optionName.startsWith("$")) {
+            variant = 0; // stable
+            baseOptionName = optionName.substring(1);
         } else {
+            variant = 1; // unstable
             baseOptionName = optionName;
-            optionInfo = injectedKnownHostedBooleanOptionInfo;
         }
-        allOptionNames.put(baseOptionName, optionInfo);
+        HostedOptionInfo[] injectedKnownHostedOptionInfo;
+        if (baseOptionName.endsWith("=")) {
+            baseOptionName = baseOptionName.substring(0, baseOptionName.length() - 1);
+            injectedKnownHostedOptionInfo = injectedKnownHostedRegularOptionInfo;
+        } else {
+            injectedKnownHostedOptionInfo = injectedKnownHostedBooleanOptionInfo;
+        }
+        allOptionNames.put(baseOptionName, injectedKnownHostedOptionInfo[variant]);
     }
 
     @Override

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

@@ -2094,19 +2094,6 @@ public static void main(String[] args) {
         performBuild(new BuildConfiguration(Arrays.asList(args)), defaultNativeImageProvider);
     }
 
-    public static List<String> translateAPIOptions(List<String> arguments) {
-        var handler = new APIOptionHandler(defaultNativeImageProvider.apply(new BuildConfiguration(arguments)));
-        var argumentQueue = new ArgumentQueue(OptionOrigin.originDriver);
-        handler.nativeImage.config.args.forEach(argumentQueue::add);
-        List<String> translatedOptions = new ArrayList<>();
-        while (!argumentQueue.isEmpty()) {
-            String translatedOption = handler.translateOption(argumentQueue);
-            String originalOption = argumentQueue.poll();
-            translatedOptions.add(translatedOption != null ? translatedOption : originalOption);
-        }
-        return translatedOptions;
-    }
-
     protected static void performBuild(BuildConfiguration config, Function<BuildConfiguration, NativeImage> nativeImageProvider) {
         try {
             build(config, nativeImageProvider);

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java

@@ -489,8 +489,10 @@ public void cleanup() {
                         Collections.emptyList());
         invokeStaticMethod("com.oracle.truffle.api.impl.ThreadLocalHandshake", "resetNativeImageState",
                         Collections.emptyList());
-        invokeStaticMethod("com.oracle.truffle.api.library.LibraryFactory", "resetNativeImageState",
-                        Collections.singletonList(ClassLoader.class), imageClassLoader);
+        if (System.getProperty("substratevm.svmtest") == null) {
+            invokeStaticMethod("com.oracle.truffle.api.library.LibraryFactory", "resetNativeImageState",
+                            Collections.singletonList(ClassLoader.class), imageClassLoader);
+        }
         invokeStaticMethod("com.oracle.truffle.api.source.Source", "resetNativeImageState", Collections.emptyList());
     }