leverage LayerOptionVerification to enable layered image to get further on a non-supported platform before failing

Author: dougxc

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

@@ -44,6 +44,7 @@
 import org.graalvm.nativeimage.impl.AnnotationExtractor;
 import org.graalvm.nativeimage.impl.ImageSingletonsSupport;
 
+import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
 import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingletonSupport;
@@ -430,7 +431,9 @@ private void addSingleton(Class<?> key, Object value) {
                     traitMap.getTrait(SingletonTraitKind.LAYERED_INSTALLATION_KIND).ifPresent(trait -> {
                         var kind = SingletonLayeredInstallationKind.getInstallationKind(trait);
                         if (forbiddenInstallationKinds.contains(kind)) {
-                            throw VMError.shouldNotReachHere("Singleton with installation kind %s can no longer be added: %s", kind, value);
+                            if (SubstrateOptions.LayerOptionVerification.getValue()) {
+                                throw VMError.shouldNotReachHere("Singleton with installation kind %s can no longer be added: %s", kind, value);
+                            }
                         }
                     });
                 }
@@ -633,10 +636,10 @@ public SingletonTraitMap getUninstalledSingletonTraitMap(Class<?> key) {
                         var installationKindSupplierClass = annotation.layeredInstallationKind();
                         /*
                          * Initial Layer information should never be injected, as either
-                         * 
+                         *
                          * 1) We are building the initial layer, so it should be present in the
                          * configObject which it exists.
-                         * 
+                         *
                          * 2) We are building an extension layer, so it is not relevant for this
                          * layer.
                          */

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/HostedImageLayerBuildingSupport.java

@@ -69,6 +69,7 @@
 import com.oracle.svm.hosted.option.HostedOptionParser;
 import com.oracle.svm.shaded.org.capnproto.ReaderOptions;
 import com.oracle.svm.shaded.org.capnproto.Serialize;
+import com.oracle.svm.util.LogUtils;
 import com.oracle.svm.util.TypeResult;
 
 import jdk.graal.compiler.core.common.SuppressFBWarnings;
@@ -324,8 +325,12 @@ public static HostedImageLayerBuildingSupport initialize(HostedOptionValues valu
                 ValueWithOrigin<String> valueWithOrigin = getLayerCreateValueWithOrigin(values);
                 String layerCreateValue = getLayerCreateValue(valueWithOrigin);
                 String layerCreateArg = SubstrateOptionsParser.commandArgument(SubstrateOptions.LayerCreate, layerCreateValue);
-                throw UserError.abort("Layer creation option '%s' from %s is not supported when building for platform %s/%s.",
+                String message = String.format("Layer creation option '%s' from %s is not supported when building for platform %s/%s.",
                                 layerCreateArg, valueWithOrigin.origin(), platform.getOS(), platform.getArchitecture());
+                if (SubstrateOptions.LayerOptionVerification.getValue(values)) {
+                    throw UserError.abort("%s", message);
+                }
+                LogUtils.warning(message);
             }
         }