Always sent in InteropLibrary

enso-org · Dec 21, 2023 · 4849ef9 · 4849ef9
1 parent 086c1d9
commit 4849ef9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 25 deletions.
diff --git a/...ument-common/src/main/scala/org/enso/interpreter/instrument/execution/ErrorResolver.scala b/...ument-common/src/main/scala/org/enso/interpreter/instrument/execution/ErrorResolver.scala
@@ -20,11 +20,7 @@ object ErrorResolver {
     throwable: Throwable
   )(implicit ctx: RuntimeContext): Vector[Api.StackTraceElement] = {
     val iop = InteropLibrary.getUncached
-    val arr = if (iop.hasExceptionStackTrace(throwable)) {
-      GetStackTraceNode.stackTraceToArray(iop, throwable)
-    } else {
-      GetStackTraceNode.stackTraceToArray(throwable)
-    }
+    val arr = GetStackTraceNode.stackTraceToArray(iop, throwable)
     val len = iop.getArraySize(arr)
     val stackWithOptions = for (i <- 0L until len) yield {
       val elem = iop.readArrayElement(arr, i)

diff --git a/...in/java/org/enso/interpreter/node/expression/builtin/error/GetAttachedStackTraceNode.java b/...in/java/org/enso/interpreter/node/expression/builtin/error/GetAttachedStackTraceNode.java
@@ -5,9 +5,6 @@
 import org.enso.interpreter.dsl.AcceptsError;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.runtime.GetStackTraceNode;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 
 @BuiltinMethod(
     type = "Panic",
@@ -17,15 +14,6 @@ public class GetAttachedStackTraceNode extends Node {
   @Child private InteropLibrary iop = InteropLibrary.getFactory().createDispatched(3);
 
   Object execute(@AcceptsError Object error) {
-    if (iop.hasExceptionStackTrace(error)) {
-      return GetStackTraceNode.stackTraceToArray(iop, error);
-    }
-    if (error instanceof Throwable) {
-      return GetStackTraceNode.stackTraceToArray((Throwable) error);
-    } else {
-      Builtins builtins = EnsoContext.get(this).getBuiltins();
-      throw new PanicException(
-          builtins.error().makeTypeError("Throwable", error, "throwable"), this);
-    }
+    return GetStackTraceNode.stackTraceToArray(iop, error);
   }
 }
diff --git a/...src/main/java/org/enso/interpreter/node/expression/builtin/runtime/GetStackTraceNode.java b/...src/main/java/org/enso/interpreter/node/expression/builtin/runtime/GetStackTraceNode.java
@@ -90,17 +90,21 @@ EnsoObject execute(VirtualFrame requestOwnStackFrame) {
   }
 
   public static EnsoObject stackTraceToArray(InteropLibrary iop, Object exception) {
-    try {
-      assert iop.hasExceptionStackTrace(exception);
-      var elements = iop.getExceptionStackTrace(exception);
-      return filterStackTraceVector(iop, elements);
-    } catch (UnsupportedMessageException ex) {
-      return ArrayLikeHelpers.empty();
+    if (iop.hasExceptionStackTrace(exception)) {
+      try {
+        var elements = iop.getExceptionStackTrace(exception);
+        return filterStackTraceVector(iop, elements);
+      } catch (UnsupportedMessageException ex) {
+        // return empty
+      }
+    } else if (exception instanceof Throwable t) {
+      return stackTraceToArray(t);
     }
+    return ArrayLikeHelpers.empty();
   }
 
   @CompilerDirectives.TruffleBoundary
-  public static EnsoObject stackTraceToArray(Throwable exception) {
+  private static EnsoObject stackTraceToArray(Throwable exception) {
     var elements = TruffleStackTrace.getStackTrace(exception);
     if (elements == null) {
       return ArrayLikeHelpers.empty();