-
Notifications
You must be signed in to change notification settings - Fork 15
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
Conversation
FTR
I used the following command and amended the original commit:
@jerboaa I had to create a new PR because I couldn't push to your branch. |
552bef1
to
4b82042
Compare
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
4b82042
to
e00edeb
Compare
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. |
I thought we do merges now and no longer force-push due to branch protections? |
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.
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.
No, we can still force push as long as the repository is under the |
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 |
This backport has been dropped in favor of the upstream oracle#9247 |
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