[GR-17457] Annotate all Ruby Throwable classes to make it easy to list them

PullRequest: truffleruby/3881

Author: eregon

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -1540,7 +1540,8 @@ protected int extractRubyTag(CapturedException captured,
     @GenerateCached(false)
     public abstract static class ExtractRubyTagHelperNode extends RubyBaseNode {
 
-        public abstract int execute(Node node, Throwable e);
+        // Object instead of Throwable to workaround Truffle DSL bug GR-46797
+        public abstract int execute(Node node, Object e);
 
         @Specialization
         protected static int dynamicReturnTag(DynamicReturnException e) {
@@ -1582,8 +1583,9 @@ protected static int throwTag(ThrowException e) {
             return RUBY_TAG_THROW;
         }
 
+        // Object instead of Throwable to workaround Truffle DSL bug GR-46797
         @Fallback
-        protected static int noTag(Throwable e) {
+        protected static int noTag(Object e) {
             return 0;
         }
     }

src/main/java/org/truffleruby/core/format/exceptions/FormatException.java

@@ -10,9 +10,10 @@
 package org.truffleruby.core.format.exceptions;
 
 import com.oracle.truffle.api.nodes.ControlFlowException;
+import org.truffleruby.language.control.RubyThrowable;
 
 @SuppressWarnings("serial")
-public class FormatException extends ControlFlowException {
+public class FormatException extends ControlFlowException implements RubyThrowable {
 
     private final String message;
 

src/main/java/org/truffleruby/language/control/BreakException.java

@@ -9,10 +9,9 @@
  */
 package org.truffleruby.language.control;
 
-import com.oracle.truffle.api.nodes.ControlFlowException;
 
 @SuppressWarnings("serial")
-public final class BreakException extends ControlFlowException {
+public final class BreakException extends RubyControlFlowException {
 
     private final BreakID breakID;
     private final Object result;

src/main/java/org/truffleruby/language/control/DynamicReturnException.java

@@ -9,10 +9,9 @@
  */
 package org.truffleruby.language.control;
 
-import com.oracle.truffle.api.nodes.ControlFlowException;
 
 @SuppressWarnings("serial")
-public final class DynamicReturnException extends ControlFlowException {
+public final class DynamicReturnException extends RubyControlFlowException {
 
     private final ReturnID returnID;
     private final Object value;

src/main/java/org/truffleruby/language/control/KillException.java

@@ -20,7 +20,7 @@
 /** Used by Thread#kill and to terminate threads. This does run code in ensure. */
 @ExportLibrary(InteropLibrary.class)
 @SuppressWarnings("serial")
-public final class KillException extends AbstractTruffleException {
+public final class KillException extends AbstractTruffleException implements RubyThrowable {
 
     @TruffleBoundary
     private static RuntimeException javaStacktrace() {

src/main/java/org/truffleruby/language/control/LocalReturnException.java

@@ -9,10 +9,9 @@
  */
 package org.truffleruby.language.control;
 
-import com.oracle.truffle.api.nodes.ControlFlowException;
 
 @SuppressWarnings("serial")
-public final class LocalReturnException extends ControlFlowException {
+public final class LocalReturnException extends RubyControlFlowException {
 
     private final Object value;
 

src/main/java/org/truffleruby/language/control/NextException.java

@@ -9,10 +9,9 @@
  */
 package org.truffleruby.language.control;
 
-import com.oracle.truffle.api.nodes.ControlFlowException;
 
 @SuppressWarnings("serial")
-public final class NextException extends ControlFlowException {
+public final class NextException extends RubyControlFlowException {
 
     private final Object result;
 

src/main/java/org/truffleruby/language/control/RaiseException.java

@@ -20,7 +20,7 @@
 /** A ControlFlowException holding a Ruby exception. */
 @SuppressWarnings("serial")
 @ExportLibrary(value = InteropLibrary.class, delegateTo = "exception")
-public final class RaiseException extends AbstractTruffleException {
+public final class RaiseException extends AbstractTruffleException implements RubyThrowable {
 
     protected final RubyException exception;
 

src/main/java/org/truffleruby/language/control/RedoException.java

@@ -9,8 +9,7 @@
  */
 package org.truffleruby.language.control;
 
-import com.oracle.truffle.api.nodes.ControlFlowException;
 
 @SuppressWarnings("serial")
-public final class RedoException extends ControlFlowException {
+public final class RedoException extends RubyControlFlowException {
 }

src/main/java/org/truffleruby/language/control/RetryException.java

@@ -9,8 +9,7 @@
  */
 package org.truffleruby.language.control;
 
-import com.oracle.truffle.api.nodes.ControlFlowException;
 
 @SuppressWarnings("serial")
-public final class RetryException extends ControlFlowException {
+public final class RetryException extends RubyControlFlowException {
 }