Fix Array.Sort.

Add assert to check BigInteger doesn't fit in Long.
enso-org · Nov 16, 2022 · bfb914e · bfb914e
1 parent 77aae57
commit bfb914e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso
@@ -1107,8 +1107,9 @@ handle_incomparable_value ~function =
     handle t = Panic.catch t handler=(_-> Error.throw Incomparable_Values_Error)
     handle ClassCastException <|
         handle No_Such_Method_Error_Data <|
-            handle Unsupported_Argument_Types_Data <|
-                function.catch Type_Error_Data handler=(_-> Error.throw Incomparable_Values_Error)
+            handle Type_Error_Data <|
+                handle Unsupported_Argument_Types_Data <|
+                    function.catch Type_Error_Data handler=(_-> Error.throw Incomparable_Values_Error)
 
 ## PRIVATE
    Creates a new vector where for each range, a corresponding section of the

diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/mutable/ComparatorNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/mutable/ComparatorNode.java
@@ -10,6 +10,7 @@
 import org.enso.interpreter.node.expression.builtin.ordering.Ordering;
 import org.enso.interpreter.runtime.Context;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
+import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.state.State;
 
@@ -44,6 +45,10 @@ public int execute(VirtualFrame frame, Object comparator, State state, Object l,
       return 1;
     } else {
       CompilerDirectives.transferToInterpreter();
+      if (atom instanceof DataflowError error) {
+        throw new PanicException(error.getPayload(), error.getLocation());
+      }
+
       var ordering = getOrdering().getType();
       throw new PanicException(
           Context.get(this).getBuiltins().error().makeTypeError(ordering, atom, "comparator"),

diff --git a/.../runtime/src/main/java/org/enso/interpreter/node/expression/builtin/mutable/SortNode.java b/.../runtime/src/main/java/org/enso/interpreter/node/expression/builtin/mutable/SortNode.java
@@ -15,6 +15,7 @@
 import org.enso.interpreter.runtime.callable.atom.Atom;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.data.Array;
+import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.state.State;
 
@@ -97,6 +98,10 @@ private int convertResult(Object res) {
         return 1;
       } else {
         resultProfile.enter();
+        if (res instanceof DataflowError error) {
+          throw new PanicException(error.getPayload(), error.getLocation());
+        }
+
         var ordering = context.getBuiltins().ordering().getType();
         throw new PanicException(
             context.getBuiltins().error().makeTypeError(ordering, res, "result"), outerThis);

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/number/EnsoBigInteger.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/number/EnsoBigInteger.java
@@ -7,7 +7,6 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
-import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
 import org.enso.interpreter.runtime.Context;
 import org.enso.interpreter.runtime.data.Type;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
@@ -26,6 +25,7 @@ public final class EnsoBigInteger implements TruffleObject {
    * @param value the value to wrap.
    */
   public EnsoBigInteger(BigInteger value) {
+    assert(value.bitLength() > 63);
     this.value = value;
   }