[GR-36905] Implement --link-at-build-time and @<prop-values-file>.

PullRequest: graal/11033

Author: olpaw

sdk/mx.sdk/mx_sdk_vm.py

@@ -159,7 +159,7 @@ def add_relative_home_path(self, language, path):
 class LauncherConfig(AbstractNativeImageConfig):
     def __init__(self, destination, jar_distributions, main_class, build_args, is_main_launcher=True,
                  default_symlinks=True, is_sdk_launcher=False, custom_launcher_script=None, extra_jvm_args=None,
-                 use_modules=None, main_module=None, option_vars=None, home_finder=True, **kwargs):
+                 use_modules=None, main_module=None, link_at_build_time=True, option_vars=None, home_finder=True, **kwargs):
         """
         :param str main_class
         :param bool is_main_launcher
@@ -174,6 +174,7 @@ def __init__(self, destination, jar_distributions, main_class, build_args, is_ma
         self.main_module = main_module
         assert self.use_modules is None or self.main_module
         self.main_class = main_class
+        self.link_at_build_time = link_at_build_time
         self.is_main_launcher = is_main_launcher
         self.default_symlinks = default_symlinks
         self.is_sdk_launcher = is_sdk_launcher

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -1256,6 +1256,8 @@ def contents(self):
                 build_args += ['-ea', '-H:-AOTInline', '-H:+PreserveFramePointer', '-H:-DeleteLocalSymbols']
             if _get_svm_support().is_debug_supported():
                 build_args += ['-g']
+            if getattr(image_config, 'link_at_build_time', True):
+                build_args += ['--link-at-build-time']
 
             graalvm_dist = get_final_graalvm_distribution()
             graalvm_location = dirname(graalvm_dist.find_single_source_location('dependency:' + self.subject.name))

substratevm/CHANGELOG.md

@@ -8,6 +8,7 @@ This changelog summarizes major changes to GraalVM Native Image.
 * Remove support for JDK8. As a result, `JDK8OrEarlier` and `JDK11OrLater` have been deprecated and will be removed in a future release.
 * (GR-26814) (GR-37018) (GR-37038) Red Hat added support for the following JFR events: `SafepointBegin`, `SafepointEnd`, `GarbageCollection`, `GCPhasePause`, and `GCPhasePauseLevel*`. All GC-related JFR events are currently limited to the serial GC.
 * (GR-35721) Deprecate `-H:±BuildOutputUseNewStyle` option. The old build output style will be removed in a future release.
+* (GR-36905) Allow incomplete classes at build-time is now default. Add --link-at-build-time option and @<prop-values-file> support for native-image.properties. Add --link-at-build-time-paths option.
 
 ## Version 22.0.0
 * (GR-33930) Decouple HostedOptionParser setup from classpath/modulepath scanning (use ServiceLoader for collecting options).

substratevm/mx.substratevm/macro-junit.properties

@@ -8,4 +8,5 @@ ImageClasspath = ${.}/junit-tool.jar:${.}/junit.jar:${.}/hamcrest.jar
 Args = -H:Features=com.oracle.svm.junit.JUnitFeature \
        -H:Class=com.oracle.svm.junit.SVMJUnitRunner \
        -H:TestFile=${*} \
-       --initialize-at-build-time=org.junit,com.oracle.mxtool.junit.MxJUnitRequest
+       --initialize-at-build-time=org.junit,com.oracle.mxtool.junit.MxJUnitRequest \
+       [email protected]

substratevm/mx.substratevm/macro-junitcp.properties

@@ -7,4 +7,5 @@ ImageClasspath = ${.}/junit-support.jar:${.}/junit-tool.jar:${.}/junit.jar:${.}/
 Args = -H:Features=com.oracle.svm.junit.JUnitFeature \
        -H:Class=com.oracle.svm.junit.SVMJUnitRunner \
        -H:TestFile=${*} \
-       --initialize-at-build-time=org.junit,com.oracle.mxtool.junit.MxJUnitRequest
+       --initialize-at-build-time=org.junit,com.oracle.mxtool.junit.MxJUnitRequest \
+       [email protected]

substratevm/mx.substratevm/suite.py

@@ -1603,6 +1603,7 @@
             "description" : "Native-image based junit testing support",
             "layout" : {
                 "native-image.properties" : "file:mx.substratevm/macro-junit.properties",
+                "svm-junit.packages" : "file:mx.substratevm/svm-junit.packages",
             },
         },
 
@@ -1611,6 +1612,7 @@
             "description" : "Native-image based junit testing support but with running image-builder on classpath",
             "layout" : {
                 "native-image.properties" : "file:mx.substratevm/macro-junitcp.properties",
+                "svm-junit.packages" : "file:mx.substratevm/svm-junit.packages",
             },
         },
 

substratevm/mx.substratevm/svm-junit.packages

@@ -0,0 +1,18 @@
+com.oracle.mxtool.junit
+junit.framework
+junit.runner
+org.hamcrest
+org.hamcrest.core
+org.hamcrest.internal
+org.junit
+org.junit.internal
+org.junit.internal.builders
+org.junit.internal.runners.model
+org.junit.internal.runners.statements
+org.junit.rules
+org.junit.runner
+org.junit.runner.manipulation
+org.junit.runner.notification
+org.junit.runners
+org.junit.runners.model
+org.junit.validator

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

@@ -47,20 +47,18 @@ public final class ReflectionConfigurationParser<T> extends ConfigurationParser
     private static final String CONSTRUCTOR_NAME = "<init>";
 
     private final ReflectionConfigurationParserDelegate<T> delegate;
-    private final boolean allowIncompleteClasspath;
     private static final List<String> OPTIONAL_REFLECT_CONFIG_OBJECT_ATTRS = Arrays.asList("allDeclaredConstructors", "allPublicConstructors",
                     "allDeclaredMethods", "allPublicMethods", "allDeclaredFields", "allPublicFields",
                     "allDeclaredClasses", "allPermittedSubclasses", "allPublicClasses", "methods", "queriedMethods", "fields", CONDITIONAL_KEY,
                     "queryAllDeclaredConstructors", "queryAllPublicConstructors", "queryAllDeclaredMethods", "queryAllPublicMethods");
 
     public ReflectionConfigurationParser(ReflectionConfigurationParserDelegate<T> delegate) {
-        this(delegate, false, true);
+        this(delegate, true);
     }
 
-    public ReflectionConfigurationParser(ReflectionConfigurationParserDelegate<T> delegate, boolean allowIncompleteClasspath, boolean strictConfiguration) {
+    public ReflectionConfigurationParser(ReflectionConfigurationParserDelegate<T> delegate, boolean strictConfiguration) {
         super(strictConfiguration);
         this.delegate = delegate;
-        this.allowIncompleteClasspath = allowIncompleteClasspath;
     }
 
     @Override
@@ -282,19 +280,15 @@ private String formatMethod(T clazz, String methodName, List<T> paramTypes) {
         return delegate.getTypeName(clazz) + '.' + methodName + '(' + parameterTypeNames + ')';
     }
 
-    private void handleError(String message) {
+    private static void handleError(String message) {
         handleError(message, null);
     }
 
-    private void handleError(String msg, Throwable cause) {
+    private static void handleError(String msg, Throwable cause) {
         String message = msg;
         if (cause != null) {
             message += " Reason: " + formatError(cause) + '.';
         }
-        if (allowIncompleteClasspath) {
-            System.err.println("Warning: " + message);
-        } else {
-            throw new JSONParserException(message + " To allow unresolvable reflection configuration, use option --allow-incomplete-classpath");
-        }
+        System.err.println("Warning: " + message);
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java

@@ -29,10 +29,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.oracle.svm.common.option.LocatableOption;
-import com.oracle.svm.common.option.MultiOptionValue;
 import org.graalvm.collections.Pair;
 
+import com.oracle.svm.common.option.LocatableOption;
+import com.oracle.svm.common.option.MultiOptionValue;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ClassUtil;
 
@@ -76,8 +76,8 @@ public List<T> values() {
         return values.stream().map(Pair::getLeft).collect(Collectors.toList());
     }
 
-    public Stream<Pair<T, String>> getValuesWithOrigins() {
-        return values.stream();
+    public Stream<Pair<T, OptionOrigin>> getValuesWithOrigins() {
+        return values.stream().map(pair -> Pair.create(pair.getLeft(), OptionOrigin.from(pair.getRight())));
     }
 
     @Override