enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-11-27 03:54:20 +03:00
Code Issues Projects Releases Wiki Activity

Upgrading to Frgaal compiler 20.0.1 (#7860)

Browse Source
This commit is contained in:
Jaroslav Tulach 2023-09-22 09:58:19 +02:00 committed by GitHub
parent 42a7cb2d23
commit ad34a701e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/runtime-instrument-id-execution/src/main/java/org/enso/interpreter/instrument/IdExecutionInstrument.java
View File

@ -162,7 +162,7 @@ public class IdExecutionInstrument extends TruffleInstrument implements IdExecut
} }
} }
private void onExpressionReturn(Object result, Node node, EventContext context, long howLong) throws ThreadDeath { private void onExpressionReturn(Object result, Node node, EventContext context, long howLong) {
boolean isPanic = result instanceof AbstractTruffleException && !(result instanceof DataflowError); boolean isPanic = result instanceof AbstractTruffleException && !(result instanceof DataflowError);
UUID nodeId = ((ExpressionNode) node).getId(); UUID nodeId = ((ExpressionNode) node).getId();

4
project/FrgaalJavaCompiler.scala
View File

@ -26,8 +26,8 @@ import java.io.FileWriter
object FrgaalJavaCompiler { object FrgaalJavaCompiler {
private val ENSO_SOURCES = ".enso-sources" private val ENSO_SOURCES = ".enso-sources"
val frgaal = "org.frgaal" % "compiler" % "19.0.1" % "provided" val frgaal = "org.frgaal" % "compiler" % "20.0.1" % "provided"
val sourceLevel = "19" val sourceLevel = "20"
val debugArg = val debugArg =
"-J-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:8000" "-J-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:8000"

14
std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java
View File

@ -41,7 +41,7 @@ public abstract class NumericBinaryOpImplementation<T extends Number, I extends
case AbstractLongStorage s -> runBigIntegerMap(BigIntegerArrayAdapter.fromStorage(s), rhs, problemBuilder); case AbstractLongStorage s -> runBigIntegerMap(BigIntegerArrayAdapter.fromStorage(s), rhs, problemBuilder);
case BigIntegerStorage s -> runBigIntegerMap(BigIntegerArrayAdapter.fromStorage(s), rhs, problemBuilder); case BigIntegerStorage s -> runBigIntegerMap(BigIntegerArrayAdapter.fromStorage(s), rhs, problemBuilder);
case DoubleStorage s -> runDoubleMap(s, rhs.doubleValue(), problemBuilder); case DoubleStorage s -> runDoubleMap(s, rhs.doubleValue(), problemBuilder);
case default -> default ->
throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName()); throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName());
}; };
} else if (NumericConverter.isCoercibleToLong(arg)) { } else if (NumericConverter.isCoercibleToLong(arg)) {
@ -51,7 +51,7 @@ public abstract class NumericBinaryOpImplementation<T extends Number, I extends
case BigIntegerStorage s -> case BigIntegerStorage s ->
runBigIntegerMap(BigIntegerArrayAdapter.fromStorage(s), BigInteger.valueOf(argAsLong), problemBuilder); runBigIntegerMap(BigIntegerArrayAdapter.fromStorage(s), BigInteger.valueOf(argAsLong), problemBuilder);
case DoubleStorage s -> runDoubleMap(s, (double) argAsLong, problemBuilder); case DoubleStorage s -> runDoubleMap(s, (double) argAsLong, problemBuilder);
case default -> default ->
throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName()); throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName());
}; };
} else if (NumericConverter.isCoercibleToDouble(arg)) { } else if (NumericConverter.isCoercibleToDouble(arg)) {
@ -60,7 +60,7 @@ public abstract class NumericBinaryOpImplementation<T extends Number, I extends
case AbstractLongStorage s -> runDoubleMap(DoubleArrayAdapter.fromStorage(s), doubleArg, problemBuilder); case AbstractLongStorage s -> runDoubleMap(DoubleArrayAdapter.fromStorage(s), doubleArg, problemBuilder);
case BigIntegerStorage s -> runDoubleMap(DoubleArrayAdapter.fromStorage(s), doubleArg, problemBuilder); case BigIntegerStorage s -> runDoubleMap(DoubleArrayAdapter.fromStorage(s), doubleArg, problemBuilder);
case DoubleStorage s -> runDoubleMap(s, doubleArg, problemBuilder); case DoubleStorage s -> runDoubleMap(s, doubleArg, problemBuilder);
case default -> default ->
throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName()); throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName());
}; };
} else { } else {
@ -82,7 +82,7 @@ public abstract class NumericBinaryOpImplementation<T extends Number, I extends
yield runBigIntegerZip(left, right, problemBuilder); yield runBigIntegerZip(left, right, problemBuilder);
} }
case DoubleStorage rhs -> runDoubleZip(DoubleArrayAdapter.fromStorage(lhs), rhs, problemBuilder); case DoubleStorage rhs -> runDoubleZip(DoubleArrayAdapter.fromStorage(lhs), rhs, problemBuilder);
case default -> throw new IllegalStateException("Unsupported storage: " + arg.getClass().getCanonicalName()); default -> throw new IllegalStateException("Unsupported storage: " + arg.getClass().getCanonicalName());
}; };
case BigIntegerStorage lhs -> { case BigIntegerStorage lhs -> {
@ -97,11 +97,11 @@ public abstract class NumericBinaryOpImplementation<T extends Number, I extends
yield runBigIntegerZip(left, right, problemBuilder); yield runBigIntegerZip(left, right, problemBuilder);
} }
case DoubleStorage rhs -> runDoubleZip(DoubleArrayAdapter.fromStorage(lhs), rhs, problemBuilder); case DoubleStorage rhs -> runDoubleZip(DoubleArrayAdapter.fromStorage(lhs), rhs, problemBuilder);
case default -> throw new IllegalStateException("Unsupported storage: " + arg.getClass().getCanonicalName()); default -> throw new IllegalStateException("Unsupported storage: " + arg.getClass().getCanonicalName());
}; };
} }
case default -> throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName()); default -> throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName());
}; };
} }
@ -135,7 +135,7 @@ public abstract class NumericBinaryOpImplementation<T extends Number, I extends
case AbstractLongStorage s -> LongStorage.makeEmpty(storage.size(), INTEGER_RESULT_TYPE); case AbstractLongStorage s -> LongStorage.makeEmpty(storage.size(), INTEGER_RESULT_TYPE);
case BigIntegerStorage s -> BigIntegerStorage.makeEmpty(storage.size()); case BigIntegerStorage s -> BigIntegerStorage.makeEmpty(storage.size());
case DoubleStorage s -> DoubleStorage.makeEmpty(storage.size()); case DoubleStorage s -> DoubleStorage.makeEmpty(storage.size());
case default -> throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName()); default -> throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName());
}; };
} }

6
std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java
View File

@ -169,7 +169,7 @@ public abstract class NumericComparison<T extends Number, I extends Storage<? su
yield runBigIntegerZip(left, right, problemBuilder); yield runBigIntegerZip(left, right, problemBuilder);
} }
case DoubleStorage rhs -> runDoubleZip(DoubleArrayAdapter.fromStorage(lhs), rhs, problemBuilder); case DoubleStorage rhs -> runDoubleZip(DoubleArrayAdapter.fromStorage(lhs), rhs, problemBuilder);
case default -> runMixedZip(lhs, arg, problemBuilder); default -> runMixedZip(lhs, arg, problemBuilder);
}; };
case BigIntegerStorage lhs -> { case BigIntegerStorage lhs -> {
@ -184,11 +184,11 @@ public abstract class NumericComparison<T extends Number, I extends Storage<? su
yield runBigIntegerZip(left, right, problemBuilder); yield runBigIntegerZip(left, right, problemBuilder);
} }
case DoubleStorage rhs -> runDoubleZip(DoubleArrayAdapter.fromStorage(lhs), rhs, problemBuilder); case DoubleStorage rhs -> runDoubleZip(DoubleArrayAdapter.fromStorage(lhs), rhs, problemBuilder);
case default -> runMixedZip(lhs, arg, problemBuilder); default -> runMixedZip(lhs, arg, problemBuilder);
}; };
} }
case default -> default ->
throw new IllegalStateException("Unsupported lhs storage: " + storage.getClass().getCanonicalName()); throw new IllegalStateException("Unsupported lhs storage: " + storage.getClass().getCanonicalName());
}; };
} }

2
std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java
View File

@ -31,7 +31,7 @@ public interface DoubleArrayAdapter {
case DoubleStorage s -> fromStorage(s); case DoubleStorage s -> fromStorage(s);
case AbstractLongStorage s -> fromStorage(s); case AbstractLongStorage s -> fromStorage(s);
case BigIntegerStorage s -> fromStorage(s); case BigIntegerStorage s -> fromStorage(s);
case default -> throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName()); default -> throw new IllegalStateException("Unsupported storage: " + storage.getClass().getCanonicalName());
}; };
} }