Ensure methods from SubstrateOptionsParser are usable in driver

Author: olpaw

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

@@ -36,7 +36,6 @@
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.option.LocatableMultiOptionValue.ValueWithOrigin;
-import com.oracle.svm.core.util.UserError;
 
 import jdk.graal.compiler.options.OptionDescriptor;
 import jdk.graal.compiler.options.OptionKey;
@@ -60,14 +59,14 @@ private static Stream<? extends String> resolveOptionValueRedirection(OptionKey<
         if (entry.trim().startsWith("@")) {
             Path valuesFile = Path.of(entry.substring(1));
             if (valuesFile.isAbsolute()) {
-                throw UserError.abort("Option '%s' provided by %s contains value redirection file '%s' that is an absolute path.",
-                                SubstrateOptionsParser.commandArgument(option, optionValue), origin, valuesFile);
+                throw new AssertionError("Option '" + SubstrateOptionsParser.commandArgument(option, optionValue) + "' provided by " + origin +
+                                " contains value redirection file '" + valuesFile + "' that is an absolute path.");
             }
             try {
                 return origin.getRedirectionValues(valuesFile).stream();
             } catch (IOException e) {
-                throw UserError.abort(e, "Option '%s' provided by %s contains invalid option value redirection.",
-                                SubstrateOptionsParser.commandArgument(option, optionValue), origin);
+                throw new AssertionError("Option '" + SubstrateOptionsParser.commandArgument(option, optionValue) + "' provided by " + origin +
+                                " contains invalid option value redirection.", e);
             }
         } else {
             return Stream.of(entry);

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

@@ -41,7 +41,6 @@
 import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
 import com.oracle.svm.common.option.UnsupportedOptionClassException;
 import com.oracle.svm.core.util.InterruptImageBuilding;
-import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.LogUtils;
 
 import jdk.graal.compiler.options.OptionDescriptor;
@@ -63,8 +62,7 @@ static OptionParseResult parseOption(EconomicMap<String, OptionDescriptor> optio
         try {
             return CommonOptionParser.parseOption(options, isHosted, option, valuesMap, optionPrefix, booleanOptionFormat);
         } catch (UnsupportedOptionClassException e) {
-            VMError.shouldNotReachHere(e.getMessage());
-            return null;
+            throw new AssertionError("Should not reach here", e);
         }
     }
 
@@ -160,7 +158,6 @@ public static double parseDouble(String v) {
      * @return recommendation for setting a option value (e.g., for option 'Name' and value 'file'
      *         it returns "-H:Name=file")
      */
-    @Platforms(Platform.HOSTED_ONLY.class)
     public static String commandArgument(OptionKey<?> option, String value) {
         return commandArgument(option, value, null);
     }
@@ -175,7 +172,6 @@ public static String commandArgument(OptionKey<?> option, String value) {
      * @return recommendation for setting a option value (e.g., for option 'Name' and value 'file'
      *         it returns "-H:Name=file")
      */
-    @Platforms(Platform.HOSTED_ONLY.class)
     public static String commandArgument(OptionKey<?> option, String value, String apiOptionName) {
         /* Ensure descriptor is loaded */
         OptionDescriptor optionDescriptor = option.loadDescriptor();
@@ -193,7 +189,9 @@ public static String commandArgument(OptionKey<?> option, String value, String a
         }
 
         if (optionDescriptor.getOptionValueType() == Boolean.class) {
-            VMError.guarantee(value.equals("+") || value.equals("-"), "Boolean option value can be only + or -");
+            if (!value.equals("+") && !value.equals("-")) {
+                throw new AssertionError("Boolean option value can be only + or -");
+            }
             for (APIOption apiOption : apiOptions) {
                 String selected = selectVariant(apiOption, apiOptionName);
                 if (selected != null) {
@@ -240,12 +238,10 @@ public static String commandArgument(OptionKey<?> option, String value, String a
         }
     }
 
-    @Platforms(Platform.HOSTED_ONLY.class)
     public static String commandArgument(OptionKey<?> option, String value, String apiOptionName, boolean escape, boolean newLine) {
         return formatCommandArgument(commandArgument(option, value, apiOptionName), escape, newLine);
     }
 
-    @Platforms(Platform.HOSTED_ONLY.class)
     public static String commandArgument(OptionKey<?> option, String value, boolean escape, boolean newLine) {
         return formatCommandArgument(commandArgument(option, value), escape, newLine);
     }
@@ -262,7 +258,9 @@ private static String formatCommandArgument(String optionMessage, boolean escape
     }
 
     private static String selectVariant(APIOption apiOption, String apiOptionName) {
-        VMError.guarantee(apiOption.name().length > 0, "APIOption requires at least one name");
+        if (apiOption.name().length <= 0) {
+            throw new AssertionError("APIOption requires at least one name");
+        }
         if (!apiOption.deprecated().equals("")) {
             return null; /* Never select deprecated API options. */
         }