Remove abstractions over different conditions

Author: vjovanov

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/TypeConfiguration.java

@@ -150,7 +150,7 @@ public void printJson(JsonWriter writer) throws IOException {
 
     @Override
     public ConfigurationParser createParser() {
-        return new ReflectionConfigurationParser<>(ConfigurationConditionResolver.identityResolver(), new ParserConfigurationAdapter(this), true, false);
+        return new ReflectionConfigurationParser<>(ConfigurationConditionResolver.identityResolver(), new ParserConfigurationAdapter(this), true, false, false);
     }
 
     @Override

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeMetadataDecoderImpl.java

@@ -33,8 +33,6 @@
 import java.lang.reflect.Parameter;
 import java.lang.reflect.RecordComponent;
 import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.function.Function;
 
 import org.graalvm.nativeimage.ImageSingletons;
@@ -43,7 +41,6 @@
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.c.NonmovableArrays;
-import com.oracle.svm.core.configure.RuntimeCondition;
 import com.oracle.svm.core.configure.RuntimeConditionSet;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
 import com.oracle.svm.core.hub.DynamicHub;
@@ -381,11 +378,7 @@ private static Object decodeField(UnsafeArrayTypeReader buf, Class<?> declaringC
 
     private static RuntimeConditionSet decodeConditions(UnsafeArrayTypeReader buf) {
         var conditionTypes = decodeArray(buf, Class.class, i -> decodeType(buf));
-        Set<RuntimeCondition> runtimeConditions = new HashSet<>(conditionTypes.length);
-        for (Class<?> conditionType : conditionTypes) {
-            runtimeConditions.add(RuntimeCondition.createTypeReachedCondition(conditionType));
-        }
-        return RuntimeConditionSet.createRuntime(runtimeConditions);
+        return RuntimeConditionSet.createDecoded(conditionTypes);
     }
 
     /**

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

@@ -128,10 +128,13 @@ public static final class Options {
         @Option(help = "Testing flag: the typeReachable condition is treated as typeReached so the semantics of programs can change.")//
         public static final HostedOptionKey<Boolean> TreatAllTypeReachableConditionsAsTypeReached = new HostedOptionKey<>(false);
 
-        @Option(help = "Testing flag: the typeReached condition is always satisfied however it prints the stack traces where it would not be satisfied.")//
+        @Option(help = "Testing flag: the 'name' is treated as 'type' reflection configuration.")//
+        public static final HostedOptionKey<Boolean> TreatAllNameEntriesAsType = new HostedOptionKey<>(false);
+
+        @Option(help = "Testing flag: the 'typeReached' condition is always satisfied however it prints the stack trace where it would not be satisfied.")//
         public static final HostedOptionKey<Boolean> TrackUnsatisfiedTypeReachedConditions = new HostedOptionKey<>(false);
 
-        @Option(help = "Testing flag: print typeReached conditions that are used on interfaces.")//
+        @Option(help = "Testing flag: print 'typeReached' conditions that are used on interfaces at build time.")//
         public static final HostedOptionKey<Boolean> TrackTypeReachedOnInterfaces = new HostedOptionKey<>(false);
 
         @Option(help = "Testing flag: every type is considered as it participates in a typeReachable condition.")//

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

@@ -215,7 +215,7 @@ protected UnresolvedConfigurationCondition parseCondition(EconomicMap<String, Ob
 
             if (conditionObject.containsKey(TYPE_REACHED_KEY)) {
                 if (!runtimeCondition) {
-                    failOnSchemaError("'" + TYPE_REACHED_KEY + "' condition can not be used in older schemas. Please migrate to the latest schema.");
+                    failOnSchemaError("'" + TYPE_REACHED_KEY + "' condition cannot be used in older schemas. Please migrate the file to the latest schema.");
                 }
                 Object object = conditionObject.get(TYPE_REACHED_KEY);
                 var condition = parseTypeContents(object);
@@ -224,7 +224,7 @@ protected UnresolvedConfigurationCondition parseCondition(EconomicMap<String, Ob
                     return UnresolvedConfigurationCondition.create(className, true);
                 }
             } else if (conditionObject.containsKey(TYPE_REACHABLE_KEY)) {
-                if (runtimeCondition) {
+                if (runtimeCondition && !TreatAllTypeReachableConditionsAsTypeReached.getValue()) {
                     failOnSchemaError("'" + TYPE_REACHABLE_KEY + "' condition can not be used with the latest schema. Please use '" + TYPE_REACHED_KEY + "'.");
                 }
                 Object object = conditionObject.get(TYPE_REACHABLE_KEY);
@@ -242,13 +242,13 @@ private static JSONParserException failOnSchemaError(String message) {
         throw new JSONParserException(message);
     }
 
-    protected static Optional<ConfigurationTypeDescriptor> parseTypeOrName(EconomicMap<String, Object> data) {
+    protected static Optional<ConfigurationTypeDescriptor> parseTypeOrName(EconomicMap<String, Object> data, boolean treatAllNameEntriesAsType) {
         Object typeObject = data.get(TYPE_KEY);
         Object name = data.get(NAME_KEY);
         if (typeObject != null) {
             return parseTypeContents(typeObject);
         } else if (name != null) {
-            return Optional.of(new NamedConfigurationTypeDescriptor(asString(name)));
+            return Optional.of(new NamedConfigurationTypeDescriptor(asString(name), treatAllNameEntriesAsType));
         } else {
             throw failOnSchemaError("must have type or name specified for an element");
         }

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

@@ -73,5 +73,5 @@ static String checkQualifiedJavaName(String javaName) {
         return canonicalizeTypeName(javaName);
     }
 
-    boolean isType();
+    boolean definedAsType();
 }

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

@@ -30,20 +30,20 @@
 
 import com.oracle.svm.core.util.json.JsonWriter;
 
-public record NamedConfigurationTypeDescriptor(String name, boolean type) implements ConfigurationTypeDescriptor {
+public record NamedConfigurationTypeDescriptor(String name, boolean definedAsType) implements ConfigurationTypeDescriptor {
 
     public NamedConfigurationTypeDescriptor(String name) {
         this(name, false);
     }
 
-    public NamedConfigurationTypeDescriptor(String name, boolean type) {
+    public NamedConfigurationTypeDescriptor(String name, boolean definedAsType) {
         this.name = ConfigurationTypeDescriptor.checkQualifiedJavaName(name);
-        this.type = type;
+        this.definedAsType = definedAsType;
     }
 
     @Override
-    public boolean isType() {
-        return type;
+    public boolean definedAsType() {
+        return definedAsType;
     }
 
     @Override
@@ -74,5 +74,4 @@ public int compareTo(ConfigurationTypeDescriptor other) {
     public void printJson(JsonWriter writer) throws IOException {
         writer.quote(name);
     }
-
 }

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

@@ -65,7 +65,7 @@ public int compareTo(ConfigurationTypeDescriptor other) {
     }
 
     @Override
-    public boolean isType() {
+    public boolean definedAsType() {
         return true;
     }
 

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

@@ -56,13 +56,15 @@ public final class ReflectionConfigurationParser<C, T> extends ConfigurationPars
                     "allPublicClasses", "methods", "queriedMethods", "fields", CONDITIONAL_KEY,
                     "queryAllDeclaredConstructors", "queryAllPublicConstructors", "queryAllDeclaredMethods", "queryAllPublicMethods", "unsafeAllocated");
     private final boolean printMissingElements;
+    private final boolean treatAllNameEntriesAsType;
 
     public ReflectionConfigurationParser(ConfigurationConditionResolver<C> conditionResolver, ReflectionConfigurationParserDelegate<C, T> delegate, boolean strictConfiguration,
-                    boolean printMissingElements) {
+                    boolean printMissingElements, boolean treatAllNameEntriesAsType) {
         super(strictConfiguration);
         this.conditionResolver = conditionResolver;
         this.printMissingElements = printMissingElements;
         this.delegate = delegate;
+        this.treatAllNameEntriesAsType = treatAllNameEntriesAsType;
     }
 
     @Override
@@ -80,11 +82,11 @@ private void parseClass(EconomicMap<String, Object> data) {
         checkAttributes(data, "reflection class descriptor object", Collections.emptyList(), OPTIONAL_REFLECT_CONFIG_OBJECT_ATTRS);
         checkHasExactlyOneAttribute(data, "reflection class descriptor object", List.of("name", "type"));
 
-        Optional<ConfigurationTypeDescriptor> type = parseTypeOrName(data);
+        Optional<ConfigurationTypeDescriptor> type = parseTypeOrName(data, treatAllNameEntriesAsType);
         if (type.isEmpty()) {
             return;
         }
-        boolean isType = type.get().isType();
+        boolean isType = type.get().definedAsType();
 
         UnresolvedConfigurationCondition unresolvedCondition = parseCondition(data, isType);
         TypeResult<C> conditionResult = conditionResolver.resolveCondition(unresolvedCondition);