src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompilerOptions.java

@@ -42,17 +42,16 @@
                    "This option exists to test handling compilation crashes gracefully. " +
                    "See the MethodFilter option for the pattern syntax. A ':Bailout' " +
                    "suffix will raise a bailout exception and a ':PermanentBailout' " +
                    "suffix will raise a permanent bailout exception.", type = OptionType.Debug)
     public static final OptionKey<String> CrashAt = new OptionKey<>(null);
-    @Option(help = "file:doc-files/CompilationBailoutActionHelp.txt", type = OptionType.User)
-    public static final EnumOptionKey<ExceptionAction> CompilationBailoutAction = new EnumOptionKey<>(ExceptionAction.Silent);
-    @Option(help = "Specifies the action to take when compilation fails with a bailout exception. " +
-                   "The accepted values are the same as for CompilationBailoutAction.", type = OptionType.User)
-     public static final EnumOptionKey<ExceptionAction> CompilationFailureAction = new EnumOptionKey<>(ExceptionAction.Diagnose);
-    @Option(help = "The maximum number of compilation failures or bailouts to handle with the action specified " +
-                   "by CompilationFailureAction or CompilationBailoutAction before changing to a less verbose action. " +
+    @Option(help = "Treat compilation bailouts like compilation failures.", type = OptionType.User)
+    public static final OptionKey<Boolean> CompilationBailoutAsFailure = new OptionKey<>(false);
+    @Option(help = "file:doc-files/CompilationFailureActionHelp.txt", type = OptionType.User)
+    public static final EnumOptionKey<ExceptionAction> CompilationFailureAction = new EnumOptionKey<>(ExceptionAction.Silent);
+    @Option(help = "The maximum number of compilation failures to handle with the action specified " +
+                   "by CompilationFailureAction before changing to a less verbose action. " +
                    "This does not apply to the ExitVM action.", type = OptionType.User)
     public static final OptionKey<Integer> MaxCompilationProblemsPerAction = new OptionKey<>(2);
     @Option(help = "Alias for CompilationFailureAction=ExitVM.", type = OptionType.User)
     public static final OptionKey<Boolean> ExitVMOnException = new OptionKey<>(false);
     // @formatter:on