Get the backtrace of TruffleException in ExceptionTranslatingNode

Author: eregon

src/main/java/org/truffleruby/language/backtrace/Backtrace.java

@@ -45,6 +45,15 @@ public Backtrace(Node location, SourceSection sourceLocation, int omitted, Throw
         this.javaThrowable = javaThrowable;
     }
 
+    public Backtrace(TruffleException exception) {
+        this.location = exception.getLocation();
+        this.sourceLocation = exception.getSourceLocation();
+        this.omitted = 0;
+        this.javaThrowable = null;
+
+        this.activations = getActivations(exception);
+    }
+
     public Backtrace copy(RubyContext context, DynamicObject exception) {
         Backtrace copy = new Backtrace(location, sourceLocation, omitted, javaThrowable);
         // A Backtrace is 1-1-1 with a RaiseException and a Ruby exception

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

@@ -19,6 +19,7 @@
 import org.truffleruby.Layouts;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.RubyNode;
+import org.truffleruby.language.backtrace.Backtrace;
 import org.truffleruby.language.backtrace.BacktraceFormatter;
 import org.truffleruby.language.backtrace.BacktraceFormatter.FormattingFlags;
 import org.truffleruby.language.control.JavaException;
@@ -285,13 +286,19 @@ private DynamicObject translateThrowable(Throwable throwable) {
                 // Java exception, print it formatted like a Ruby exception
                 final String message = t.getMessage();
                 builder.append(message != null ? message : "<no message>");
-
                 builder.append(" (").append(t.getClass().getSimpleName()).append(")\n");
 
-                // Print the first 10 lines of backtrace
-                final StackTraceElement[] stackTrace = t.getStackTrace();
-                for (int i = 0; i < Math.min(stackTrace.length, 10); i++) {
-                    stackTraceElementToRuby(builder, stackTrace[i]);
+                if (t instanceof TruffleException) {
+                    final Backtrace backtrace = new Backtrace((TruffleException) t);
+                    final BacktraceFormatter formatter = new BacktraceFormatter(getContext(), EnumSet.noneOf(FormattingFlags.class));
+                    final String formattedBacktrace = formatter.formatBacktrace(null, backtrace);
+                    builder.append(formattedBacktrace).append('\n');
+                } else {
+                    // Print the first 10 lines of backtrace
+                    final StackTraceElement[] stackTrace = t.getStackTrace();
+                    for (int i = 0; i < Math.min(stackTrace.length, 10); i++) {
+                        stackTraceElementToRuby(builder, stackTrace[i]);
+                    }
                 }
             }