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.

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

[24.1] Backport https://github.com/oracle/graal/pull/9078 #757

Merged
merged 2 commits into from
Jun 27, 2024

Conversation

zakkak
Copy link
Collaborator

@zakkak zakkak commented Jun 26, 2024

Backports the following commits:

ceaac5f Automatic merge of master into galahad
f1a2d95 Automatic merge of master into galahad
59a170e compiler: adopt "JDK-8332826: Make hashCode methods in ArraysSupport friendlier"
2b2754d svm: adopt "JDK-8331189: Implementation of Scoped Values (Third Preview)"
07d3bc2 update galahad-jdk
90def08 compiler: no more JDK 21 style gate in galahad
2a04dde Automatic merge of master into galahad
d2f6535 Automatic merge of master into galahad
e1771d1 Automatic merge of master into galahad
268aa8d reduce galahad gate to bare minimum
3bd8754 [JDK-8333292] Fix libgraal build broken by JDK-8331189.
188f35a Fix libgraal build broken by JDK-8331877.
95415ad [JDK-8333362] Fix libgraal build broken by JDK-8331877.
3fbd87a Automatic merge of master into galahad
93923e4 Automatic merge of master into galahad
a29b4da Automatic merge of master into galahad
ee5cef4 Automatic merge of master into galahad
8b40a6a Automatic merge of master into galahad
4d34880 Merge master into galahad
414d874 [GR-54472] Resolve merge conflits.
78ec64e Automatic merge of master into galahad
768bab8 Automatic merge of master into galahad
ca7c3ca Automatic merge of master into galahad
4ce7fe8 Automatic merge of master into galahad
02a83e9 Automatic merge of master into galahad
b6f3365 Automatic merge of master into galahad
859ea9d Fix incorrect resolution of merge conflicts for VectorizedHashCodeTest
8f4c214 Automatic merge of master into galahad
bdedb09 Automatic merge of master into galahad
103dbca Automatic merge of master into galahad

Supersedes #751

@zakkak zakkak added backport affects/JDK23 Affects JDK 23 based Mandrel affects/24.1 Mandrel for JDK 23 labels Jun 26, 2024
@zakkak zakkak added this to the 24.1.0.0-Final milestone Jun 26, 2024
@zakkak zakkak requested a review from jerboaa June 26, 2024 18:58
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jun 26, 2024
@zakkak
Copy link
Collaborator Author

zakkak commented Jun 26, 2024

FTR

If you feel like it's worth going this route of cherry-picking 44 commits then yes, please, take it over.

I used the following command and amended the original commit:

curl -s https://api.github.com/repos/oracle/graal/pulls/9078/commits | jq -r '.[] | "\(.sha) \(.commit.message)"'

@jerboaa I had to create a new PR because I couldn't push to your branch.

@zakkak zakkak force-pushed the mandrel/24.1-jdk-upgrade branch 3 times, most recently from 552bef1 to 4b82042 Compare June 26, 2024 19:14
zakkak and others added 2 commits June 26, 2024 22:15
Backports the following commits:

ceaac5f Automatic merge of master into galahad
f1a2d95 Automatic merge of master into galahad
59a170e compiler: adopt "JDK-8332826: Make hashCode methods in ArraysSupport friendlier"
2b2754d svm: adopt "JDK-8331189: Implementation of Scoped Values (Third Preview)"
07d3bc2 update galahad-jdk
90def08 compiler: no more JDK 21 style gate in galahad
2a04dde Automatic merge of master into galahad
d2f6535 Automatic merge of master into galahad
e1771d1 Automatic merge of master into galahad
268aa8d reduce galahad gate to bare minimum
3bd8754 [JDK-8333292] Fix libgraal build broken by JDK-8331189.
188f35a Fix libgraal build broken by JDK-8331877.
95415ad [JDK-8333362] Fix libgraal build broken by JDK-8331877.
3fbd87a Automatic merge of master into galahad
93923e4 Automatic merge of master into galahad
a29b4da Automatic merge of master into galahad
ee5cef4 Automatic merge of master into galahad
8b40a6a Automatic merge of master into galahad
4d34880 Merge master into galahad
414d874 [GR-54472] Resolve merge conflits.
78ec64e Automatic merge of master into galahad
768bab8 Automatic merge of master into galahad
ca7c3ca Automatic merge of master into galahad
4ce7fe8 Automatic merge of master into galahad
02a83e9 Automatic merge of master into galahad
b6f3365 Automatic merge of master into galahad
859ea9d Fix incorrect resolution of merge conflicts for VectorizedHashCodeTest
8f4c214 Automatic merge of master into galahad
bdedb09 Automatic merge of master into galahad
103dbca Automatic merge of master into galahad
@zakkak zakkak force-pushed the mandrel/24.1-jdk-upgrade branch from 4b82042 to e00edeb Compare June 26, 2024 19:15
@zakkak
Copy link
Collaborator Author

zakkak commented Jun 26, 2024

I went ahead and added the Mandrel readme, patched the version to match the Mandrel scheme and added workflows.

As with previous releases, moving forward we should rebase this branch on top of https://github.com/oracle/graal/tree/release/graal-vm/24.1 and force push until the first 24.1.x release.

@jerboaa
Copy link
Collaborator

jerboaa commented Jun 27, 2024

As with previous releases, moving forward we should rebase this branch on top of https://github.com/oracle/graal/tree/release/graal-vm/24.1 and force push until the first 24.1.x release.

I thought we do merges now and no longer force-push due to branch protections?

Copy link
Collaborator

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK.

Lots of test failures that look like this:

 Caused by: java.lang.NoSuchMethodError: jakarta.ws.rs.ext.Providers.getContextResolver(java.lang.Class, jakarta.ws.rs.core.MediaType)
	at jdk.proxy4/jdk.proxy4.$Proxy/sfa608265.$getMethod(Unknown Source)
	... 38 more

But that's for a different patch.

@zakkak
Copy link
Collaborator Author

zakkak commented Jun 27, 2024

I thought we do merges now and no longer force-push due to branch protections?

No, we can still force push as long as the repository is under the oracle organization. I added an exception for mandrel/24.1 in https://github.com/graalvm/mandrel/settings/branches

@zakkak
Copy link
Collaborator Author

zakkak commented Jun 27, 2024

OK.

Lots of test failures that look like this:

 Caused by: java.lang.NoSuchMethodError: jakarta.ws.rs.ext.Providers.getContextResolver(java.lang.Class, jakarta.ws.rs.core.MediaType)
	at jdk.proxy4/jdk.proxy4.$Proxy/sfa608265.$getMethod(Unknown Source)
	... 38 more

That would be quarkusio/quarkus#41283, which should be fixed by oracle#9184 (waiting for CI to confirm), so we would need to backport oracle#9184 as well. Tracked in #758

@zakkak zakkak merged commit fdd6b77 into graalvm:mandrel/24.1 Jun 27, 2024
25 of 42 checks passed
@zakkak zakkak deleted the mandrel/24.1-jdk-upgrade branch June 27, 2024 08:50
@jerboaa jerboaa changed the title Backport https://github.com/oracle/graal/pull/9078 [24.1] Backport https://github.com/oracle/graal/pull/9078 Jun 27, 2024
@zakkak
Copy link
Collaborator Author

zakkak commented Jul 5, 2024

This backport has been dropped in favor of the upstream oracle#9247

@zakkak zakkak removed the backport label Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects/JDK23 Affects JDK 23 based Mandrel affects/24.1 Mandrel for JDK 23 OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants