-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
GraalVM 23.1 backports for jdk21.0.4 #4
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit af68df3)
(cherry picked from commit 9440549)
…ould return TIMED_WAITING virtual thread is timed parked" [GR-48899] (cherry picked from commit 421ff99) Adapted conditionals tot est for <= 21.0.3 as the corresponding upstream patches have been backported to 21.0.4
Changes needed to adopt to https://bugs.openjdk.org/browse/JDK-8312498 which got backported to 21 with https://bugs.openjdk.org/browse/JDK-8326966 (cherry picked from commit 4fad6c2) Adapted conditionals to test for <= 21.0.3 or >= 21.0.4 as the corresponding upstream patches have been backported to 21.0.4
…" [GR-50851] openjdk/jdk@29d7a22 (cherry picked from commit 595ac63) Adapted conditionals to test for <= 21.0.3 or >= 21.0.4 as the corresponding upstream patches have been backported to 21.0.4
…" [JDK-8310913] (cherry picked from commit 0f2c3c1)
oracle-contributor-agreement
bot
added
the
OCA Verified
All contributors have signed the Oracle Contributor Agreement.
label
Jun 4, 2024
Fixes graalvm/mandrel#716 (cherry picked from commit 39988d343d32ec99d86dbd57f2c55200233c9815)
… SecureRandom constructor"'
simonis
force-pushed
the
backports-for-jdk21.0.4
branch
from
June 13, 2024 14:11
3fbcab9
to
dcecff7
Compare
pushkarnk
added a commit
to canonical/graalvm-jdk21u
that referenced
this pull request
Aug 14, 2024
Borrowed with thanks from graalvm#4
zakkak
approved these changes
Aug 20, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @simonis!
zakkak
added a commit
to zakkak/graalvm-community-jdk21u
that referenced
this pull request
Aug 20, 2024
Style issues introduced by graalvm#4
This was referenced Aug 20, 2024
Closed
jerboaa
pushed a commit
to jerboaa/graalvm-for-jdk21-community-backports
that referenced
this pull request
Aug 22, 2024
Style issues introduced by graalvm#4
zakkak
added a commit
to zakkak/mandrel
that referenced
this pull request
Jan 23, 2025
While setting up the https://github.com/graalvm/graalvm-community-jdk21u repository and figuring out the details of how to maintain community backports, the GraalVM team pushed the `vm-23.1.4` and `vm-23.1.5` tags in the https://github.com/oracle/graal/ repository. These tags include changes not yet merged in the https://github.com/graalvm/graalvm-community-jdk21u repository whose `vm-23.1.5` deviates from that of the https://github.com/oracle/graal/ repository. This merge aims to bring in all the changes from the upstream `vm-23.1.5` reducing the differences between the Oracle GraalVM 23.1 releases and the community ones. The merge applied cleanly except for a few cases that were trivial to resolve. Two of them were related to graalvm/graalvm-community-jdk21u#23. One was related to graalvm/graalvm-community-jdk21u#4 supporting jdk versions < 21.0.4 while upstream does not. And the last one was related to the comment in graalvm/graalvm-community-jdk21u#23.
zakkak
added a commit
to zakkak/graalvm-community-jdk21u
that referenced
this pull request
Jan 23, 2025
While setting up the https://github.com/graalvm/graalvm-community-jdk21u repository and figuring out the details of how to maintain community backports, the GraalVM team pushed the `vm-23.1.4` and `vm-23.1.5` tags in the https://github.com/oracle/graal/ repository. These tags include changes not yet merged in the https://github.com/graalvm/graalvm-community-jdk21u repository whose `vm-23.1.5` deviates from that of the https://github.com/oracle/graal/ repository. This merge aims to bring in all the changes from the upstream `vm-23.1.5` reducing the differences between the Oracle GraalVM 23.1 releases and the community ones. The merge applied cleanly except for a few cases that were trivial to resolve. Two of them were related to graalvm#23. One was related to graalvm#4 supporting jdk versions < 21.0.4 while upstream does not. And the last one was related to the comment in graalvm#23.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR replaces #1 and aims to make the GraalVM 23.1 version compatible with the upcoming OpenJDK 21.0.4 release.
It is based on the corresponding PR #738 in the graalvm/mandrel repository
but fixes an issue in that PR by replacing the commit Adopt "JDK-8324646: Avoid Class.forName in SecureRandom constructor" which has a bug, with a version of the upstream commit svm: adopt "JDK-8324646: Avoid Class.forName in SecureRandom constructor adapted for OpenJDK 21.0.4plus the fix from PR #745.