[GR-17457] Remove option to translate AssertionError.

PullRequest: truffleruby/1761

Author: bjfish

src/main/java/org/truffleruby/language/methods/TranslateExceptionNode.java

@@ -222,7 +222,7 @@ private DynamicObject translateUnsupportedSpecialization(
 
     @TruffleBoundary
     private DynamicObject translateThrowable(RubyContext context, Throwable throwable) {
-        if (throwable instanceof AssertionError && !context.getOptions().EXCEPTIONS_TRANSLATE_ASSERT) {
+        if (throwable instanceof AssertionError) {
             throw (AssertionError) throwable;
         }
 

src/main/java/org/truffleruby/options/Options.java

@@ -91,8 +91,6 @@ public class Options {
     public final boolean EXCEPTIONS_PRINT_UNCAUGHT_JAVA;
     /** --exceptions-print-ruby-for-java=false */
     public final boolean EXCEPTIONS_PRINT_RUBY_FOR_JAVA;
-    /** --exceptions-translate-assert=true */
-    public final boolean EXCEPTIONS_TRANSLATE_ASSERT;
     /** --exceptions-warn-stackoverflow=true */
     public final boolean EXCEPTIONS_WARN_STACKOVERFLOW;
     /** --exceptions-warn-out-of-memory=true */
@@ -317,7 +315,6 @@ public Options(Env env, OptionValues options) {
         EXCEPTIONS_PRINT_JAVA = options.get(OptionsCatalog.EXCEPTIONS_PRINT_JAVA_KEY);
         EXCEPTIONS_PRINT_UNCAUGHT_JAVA = options.get(OptionsCatalog.EXCEPTIONS_PRINT_UNCAUGHT_JAVA_KEY);
         EXCEPTIONS_PRINT_RUBY_FOR_JAVA = options.get(OptionsCatalog.EXCEPTIONS_PRINT_RUBY_FOR_JAVA_KEY);
-        EXCEPTIONS_TRANSLATE_ASSERT = options.get(OptionsCatalog.EXCEPTIONS_TRANSLATE_ASSERT_KEY);
         EXCEPTIONS_WARN_STACKOVERFLOW = options.get(OptionsCatalog.EXCEPTIONS_WARN_STACKOVERFLOW_KEY);
         EXCEPTIONS_WARN_OUT_OF_MEMORY = options.get(OptionsCatalog.EXCEPTIONS_WARN_OUT_OF_MEMORY_KEY);
         BACKTRACES_INTERLEAVE_JAVA = options.get(OptionsCatalog.BACKTRACES_INTERLEAVE_JAVA_KEY);
@@ -484,8 +481,6 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return EXCEPTIONS_PRINT_UNCAUGHT_JAVA;
             case "ruby.exceptions-print-ruby-for-java":
                 return EXCEPTIONS_PRINT_RUBY_FOR_JAVA;
-            case "ruby.exceptions-translate-assert":
-                return EXCEPTIONS_TRANSLATE_ASSERT;
             case "ruby.exceptions-warn-stackoverflow":
                 return EXCEPTIONS_WARN_STACKOVERFLOW;
             case "ruby.exceptions-warn-out-of-memory":

src/options.yml

@@ -49,7 +49,6 @@ EXPERT:
     EXCEPTIONS_PRINT_JAVA: [exceptions-print-java, boolean, false, Print Java exceptions at the point of translating them to Ruby exceptions]
     EXCEPTIONS_PRINT_UNCAUGHT_JAVA: [exceptions-print-uncaught-java, boolean, false, Print uncaught Java exceptions at the point of translating them to Ruby exceptions]
     EXCEPTIONS_PRINT_RUBY_FOR_JAVA: [exceptions-print-ruby-for-java, boolean, false, 'When printing a Java backtrace, also print the Ruby backtrace at that point']
-    EXCEPTIONS_TRANSLATE_ASSERT: [exceptions-translate-assert, boolean, true, Translate failed Java assertions to Ruby exceptions]
     EXCEPTIONS_WARN_STACKOVERFLOW: [exceptions-warn-stackoverflow, boolean, true, Warn when a stack overflow error is thrown]
     EXCEPTIONS_WARN_OUT_OF_MEMORY: [exceptions-warn-out-of-memory, boolean, true, Warn when an out-of-memory error is thrown]
     BACKTRACES_INTERLEAVE_JAVA: [backtraces-interleave-java, boolean, false, Interleave Java stacktraces into the Ruby backtrace]

src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java

@@ -54,7 +54,6 @@ public class OptionsCatalog {
     public static final OptionKey<Boolean> EXCEPTIONS_PRINT_JAVA_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> EXCEPTIONS_PRINT_UNCAUGHT_JAVA_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> EXCEPTIONS_PRINT_RUBY_FOR_JAVA_KEY = new OptionKey<>(false);
-    public static final OptionKey<Boolean> EXCEPTIONS_TRANSLATE_ASSERT_KEY = new OptionKey<>(true);
     public static final OptionKey<Boolean> EXCEPTIONS_WARN_STACKOVERFLOW_KEY = new OptionKey<>(true);
     public static final OptionKey<Boolean> EXCEPTIONS_WARN_OUT_OF_MEMORY_KEY = new OptionKey<>(true);
     public static final OptionKey<Boolean> BACKTRACES_INTERLEAVE_JAVA_KEY = new OptionKey<>(false);
@@ -388,13 +387,6 @@ public class OptionsCatalog {
             .stability(OptionStability.EXPERIMENTAL)
             .build();
 
-    public static final OptionDescriptor EXCEPTIONS_TRANSLATE_ASSERT = OptionDescriptor
-            .newBuilder(EXCEPTIONS_TRANSLATE_ASSERT_KEY, "ruby.exceptions-translate-assert")
-            .help("Translate failed Java assertions to Ruby exceptions")
-            .category(OptionCategory.EXPERT)
-            .stability(OptionStability.EXPERIMENTAL)
-            .build();
-
     public static final OptionDescriptor EXCEPTIONS_WARN_STACKOVERFLOW = OptionDescriptor
             .newBuilder(EXCEPTIONS_WARN_STACKOVERFLOW_KEY, "ruby.exceptions-warn-stackoverflow")
             .help("Warn when a stack overflow error is thrown")
@@ -1123,8 +1115,6 @@ public static OptionDescriptor fromName(String name) {
                 return EXCEPTIONS_PRINT_UNCAUGHT_JAVA;
             case "ruby.exceptions-print-ruby-for-java":
                 return EXCEPTIONS_PRINT_RUBY_FOR_JAVA;
-            case "ruby.exceptions-translate-assert":
-                return EXCEPTIONS_TRANSLATE_ASSERT;
             case "ruby.exceptions-warn-stackoverflow":
                 return EXCEPTIONS_WARN_STACKOVERFLOW;
             case "ruby.exceptions-warn-out-of-memory":
@@ -1354,7 +1344,6 @@ public static OptionDescriptor[] allDescriptors() {
             EXCEPTIONS_PRINT_JAVA,
             EXCEPTIONS_PRINT_UNCAUGHT_JAVA,
             EXCEPTIONS_PRINT_RUBY_FOR_JAVA,
-            EXCEPTIONS_TRANSLATE_ASSERT,
             EXCEPTIONS_WARN_STACKOVERFLOW,
             EXCEPTIONS_WARN_OUT_OF_MEMORY,
             BACKTRACES_INTERLEAVE_JAVA,

src/test/java/org/truffleruby/RubyTest.java

@@ -62,7 +62,6 @@ protected void testInContext(Runnable test) {
     public static Context.Builder setupContext(Context.Builder builder) {
         return builder
                 .allowAllAccess(true)
-                .option(OptionsCatalog.EXCEPTIONS_TRANSLATE_ASSERT.getName(), "false")
                 .option(OptionsCatalog.BASICOPS_INLINE.getName(), "false");
     }