First draft of the compatibility mode

Author: vjovanov

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

@@ -1476,6 +1476,16 @@ public enum ReportingMode {
     @Option(help = "Number of context lines printed for each missing registration error in Warn mode")//
     public static final RuntimeOptionKey<Integer> MissingRegistrationWarnContextLines = new RuntimeOptionKey<>(8);
 
+    @Option(help = "Remove all Native-Image-specific behavior from build time or runtime for classpath/module-path classes.")//
+    public static final HostedOptionKey<Boolean> CompatibilityMode = new HostedOptionKey<>(false) {
+        @Override
+        protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean oldValue, Boolean newValue) {
+            super.onValueUpdate(values, oldValue, newValue);
+            FutureDefaultsOptions.FutureDefaults.update(values, "all");
+            RuntimeClassLoading.Options.RuntimeClassLoading.update(values, true);
+        }
+    };
+
     @Option(help = "Instead of warning, throw IOExceptions for link-at-build-time resources at build time")//
     public static final HostedOptionKey<Boolean> ThrowLinkAtBuildTimeIOExceptions = new HostedOptionKey<>(false);
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java

@@ -146,13 +146,15 @@ protected SystemPropertiesSupport() {
         initializeProperty("java.ext.dirs", "");
         initializeProperty("sun.arch.data.model", Integer.toString(ConfigurationValues.getTarget().wordJavaKind.getBitCount()));
 
-        initializeProperty(ImageInfo.PROPERTY_IMAGE_CODE_KEY, ImageInfo.PROPERTY_IMAGE_CODE_VALUE_RUNTIME);
+        if (!SubstrateOptions.CompatibilityMode.getValue()) {
+            initializeProperty(ImageInfo.PROPERTY_IMAGE_CODE_KEY, ImageInfo.PROPERTY_IMAGE_CODE_VALUE_RUNTIME);
 
-        for (String futureDefault : FutureDefaultsOptions.getFutureDefaults()) {
-            initializeProperty(FutureDefaultsOptions.SYSTEM_PROPERTY_PREFIX + futureDefault, Boolean.TRUE.toString());
-        }
-        for (String futureDefault : FutureDefaultsOptions.getRetiredFutureDefaults()) {
-            initializeProperty(FutureDefaultsOptions.SYSTEM_PROPERTY_PREFIX + futureDefault, Boolean.TRUE.toString());
+            for (String futureDefault : FutureDefaultsOptions.getFutureDefaults()) {
+                initializeProperty(FutureDefaultsOptions.SYSTEM_PROPERTY_PREFIX + futureDefault, Boolean.TRUE.toString());
+            }
+            for (String futureDefault : FutureDefaultsOptions.getRetiredFutureDefaults()) {
+                initializeProperty(FutureDefaultsOptions.SYSTEM_PROPERTY_PREFIX + futureDefault, Boolean.TRUE.toString());
+            }
         }
 
         ArrayList<LazySystemProperty> lazyProperties = new ArrayList<>();

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

@@ -757,9 +757,11 @@ public boolean processMetaInfResource(Path classpathEntry, Path resourceRoot, Pa
                 if (imageNameValue != null) {
                     addPlainImageBuilderArg(oHName + resolver.apply(imageNameValue), resourcePath.toUri().toString());
                 }
-                forEachPropertyValue(properties.get("JavaArgs"), NativeImage.this::addImageBuilderJavaArgs, resolver);
-                forEachPropertyValue(properties.get("Args"), args, resolver);
-                forEachPropertyValue(properties.get("ProvidedHostedOptions"), apiOptionHandler::injectKnownHostedOption, resolver);
+                if (!isCompatibilityModeEnabled()) {
+                    forEachPropertyValue(properties.get("JavaArgs"), NativeImage.this::addImageBuilderJavaArgs, resolver);
+                    forEachPropertyValue(properties.get("Args"), args, resolver);
+                    forEachPropertyValue(properties.get("ProvidedHostedOptions"), apiOptionHandler::injectKnownHostedOption, resolver);
+                }
             } else {
                 args.accept(oH(type.optionKey) + resourceRoot.relativize(resourcePath));
             }
@@ -1510,6 +1512,10 @@ private static Boolean getHostedOptionBooleanArgumentValue(List<String> args, Op
         return result;
     }
 
+    private boolean isCompatibilityModeEnabled() {
+        return Boolean.TRUE.equals(getHostedOptionBooleanArgumentValue(imageBuilderArgs, SubstrateOptions.CompatibilityMode));
+    }
+
     private boolean shouldAddCWDToCP() {
         if (config.buildFallbackImage() || printFlagsOptionQuery != null || printFlagsWithExtraHelpOptionQuery != null) {
             return false;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotationSubstitutionProcessor.java

@@ -397,6 +397,11 @@ protected void handleClass(Class<?> annotatedClass, Set<Module> builderModules)
             return;
         }
 
+        boolean userSubstitution = !builderModules.contains(annotatedClass.getModule());
+        if (SubstrateOptions.CompatibilityMode.getValue() && userSubstitution) {
+            return;
+        }
+
         TargetClass targetClassAnnotation = lookupAnnotation(annotatedClass, TargetClass.class);
         Class<?> originalClass = findTargetClass(annotatedClass, targetClassAnnotation);
         if (originalClass == null) {
@@ -415,7 +420,6 @@ protected void handleClass(Class<?> annotatedClass, Set<Module> builderModules)
         int numAnnotations = (deleteAnnotation != null ? 1 : 0) + (substituteAnnotation != null ? 1 : 0);
         guarantee(numAnnotations <= 1, "Only one of @Delete or @Substitute can be used: %s", annotatedClass);
 
-        boolean userSubstitution = !builderModules.contains(annotatedClass.getModule());
         if (deleteAnnotation != null) {
             handleDeletedClass(originalClass, deleteAnnotation);
         } else if (substituteAnnotation != null) {