Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to GraalVM 24.0.0 #9647

Merged
merged 10 commits into from
Apr 12, 2024
Merged

Update to GraalVM 24.0.0 #9647

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a9c83ba
Update to GraalVM 24.0.0 in build scripts
Akirathan Apr 8, 2024
af763c2
Revert 4a398ecb7bc3f41586c7034d1d4063b89ecb7e9c
Akirathan Apr 8, 2024
9da601e
org.graalvm.py uses org.graalvm.shadowed:xz instead of the org.tukaan…
Akirathan Apr 8, 2024
2fd03c6
Explicitly specify language home via system property
Akirathan Apr 9, 2024
e8f9fe4
Fix env var specification on windows
Akirathan Apr 9, 2024
985a9cb
Remove all the @Cached ignore workarounds
Akirathan Apr 10, 2024
2744639
Remove all the @Cached ignore workarounds
Akirathan Apr 10, 2024
9c3eeff
license review
Akirathan Apr 11, 2024
0a3bf0a
Merge branch 'refs/heads/develop' into wip/akirathan/9609-upgrade-gra…
Akirathan Apr 12, 2024
ff9043a
Fix license review after develop merge
Akirathan Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ val graalVersion = "21.0.2"
// Version used for the Graal/Truffle related Maven packages
// Keep in sync with GraalVM.version. Do not change the name of this variable,
// it is used by the Rust build script via regex matching.
val graalMavenPackagesVersion = "23.1.2"
val graalMavenPackagesVersion = "24.0.0"
val targetJavaVersion = "17"
val defaultDevEnsoVersion = "0.0.0-dev"
val ensoVersion = sys.env.getOrElse(
Expand Down
2 changes: 1 addition & 1 deletion distribution/bin/enso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ for opt in "$@"; do
done


exec java --module-path $COMP_PATH $EXTRA_OPTS $JAVA_OPTS -m org.enso.runtime/org.enso.EngineRunnerBootLoader "$@"
exec java --module-path $COMP_PATH -Dorg.graalvm.language.enso.home=$COMP_PATH $EXTRA_OPTS $JAVA_OPTS -m org.enso.runtime/org.enso.EngineRunnerBootLoader "$@"
JaroslavTulach marked this conversation as resolved.
Show resolved Hide resolved
exit
2 changes: 1 addition & 1 deletion distribution/bin/enso.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ if /I %%A==--dump-graphs (
set EXTRA_OPTS=%EXTRA_OPTS% -Dgraal.Dump=Truffle:1
)
)
java --module-path %comp-dir% -Dpolyglot.compiler.IterativePartialEscape=true %EXTRA_OPTS% %JAVA_OPTS% -m org.enso.runtime/org.enso.EngineRunnerBootLoader %*
java --module-path %comp-dir% -Dorg.graalvm.language.enso.home=%comp-dir% -Dpolyglot.compiler.IterativePartialEscape=true %EXTRA_OPTS% %JAVA_OPTS% -m org.enso.runtime/org.enso.EngineRunnerBootLoader %*
exit /B %errorlevel%
4 changes: 2 additions & 2 deletions engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@ boolean isLimitReached(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsL
}

@ExportMessage
boolean hasType(@Shared("ignore") @Cached("1") int ignore) {
Akirathan marked this conversation as resolved.
Show resolved Hide resolved
boolean hasType() {
return true;
}

@ExportMessage
Type getType(@Bind("$node") Node node, @Shared("ignore") @Cached("1") int ignore) {
Type getType(@Bind("$node") Node node) {
var ctx = EnsoContext.get(node);
return ctx.getBuiltins().array();
}
Expand Down
4 changes: 2 additions & 2 deletions project/GraalVM.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import scala.collection.immutable.Seq
*/
object GraalVM {
// Keep in sync with graalMavenPackagesVersion in build.sbt
val version: String = "23.1.2"
val version: String = "24.0.0"

/** The list of modules that are included in the `component` directory in engine distribution.
* When invoking the `java` command, these modules need to be put on the module-path.
Expand Down Expand Up @@ -64,7 +64,7 @@ object GraalVM {
"org.graalvm.tools" % "profiler-tool" % version,
"org.graalvm.shadowed" % "json" % version,
"org.graalvm.shadowed" % "icu4j" % version,
"org.tukaani" % "xz" % "1.9"
"org.graalvm.shadowed" % "xz" % version
)

val jsPkgs = Seq(
Expand Down
Loading