Allow error reporting to get demoted to warning to work around non-compliant applications

Author: olpaw

java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py

@@ -371,6 +371,7 @@ def extra_image_build_argument(self, benchmark, args):
                 '-H:EnableURLProtocols=http',
                 '-H:NativeLinkerOption=-no-pie',
                 '-H:-UseServiceLoaderFeature',
+                '-H:+TolerateBuilderClassesOnImageClasspath', # needs to be removed once GR-41746 is fixed
                 '--add-exports=org.graalvm.sdk/org.graalvm.nativeimage.impl=ALL-UNNAMED',
                 '--add-exports=org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UNNAMED',
                 '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.configure=ALL-UNNAMED',

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

@@ -845,4 +845,7 @@ public Boolean getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> v
         }
     };
 
+    @Option(help = "Instead of abort, only warn if image builder classes are found on the image class-path.", type = Debug)//
+    public static final HostedOptionKey<Boolean> TolerateBuilderClassesOnImageClasspath = new HostedOptionKey<>(false);
+
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java

@@ -819,6 +819,7 @@ public void reportBuilderClassesInApplication() {
             var destinationMap = builderURILocations.contains(classesEntries.getKey()) ? builderClasses : applicationClasses;
             destinationMap.put(classesEntries.getKey(), classesEntries.getValue());
         }
+        boolean tolerateViolations = SubstrateOptions.TolerateBuilderClassesOnImageClasspath.getValue(parsedHostedOptions);
         MapCursor<URI, EconomicSet<String>> applicationClassesEntries = applicationClasses.getEntries();
         while (applicationClassesEntries.advance()) {
             var applicationClassContainer = applicationClassesEntries.getKey();
@@ -827,9 +828,13 @@ public void reportBuilderClassesInApplication() {
                 while (builderClassesEntries.advance()) {
                     var builderClassContainer = builderClassesEntries.getKey();
                     if (builderClassesEntries.getValue().contains(applicationClass)) {
-                        throw UserError.abort("Class-path entry %s contains class %s. This class is part of the image builder itself (in %s) and must not be passed via -cp. " +
-                                        "This can be caused by a fat-jar that illegally includes svm.jar (or graal-sdk.jar) due to its build-time dependency on it.%n",
+                        String message = String.format("Class-path entry %s contains class %s. This class is part of the image builder itself (in %s) and must not be passed via -cp.",
                                         applicationClassContainer, applicationClass, builderClassContainer);
+                        if (!tolerateViolations) {
+                            throw UserError.abort(message + " This can be caused by a fat-jar that illegally includes svm.jar (or graal-sdk.jar) due to its build-time dependency on it.%n");
+                        } else {
+                            System.out.println("Warning: " + message);
+                        }
                     }
                 }
             }