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

Merge upstream changes into Mandrel 23.1 release branch #787

Merged

Conversation

jerboaa
Copy link
Collaborator

@jerboaa jerboaa commented Aug 27, 2024

A trivial merge which only includes the whitespace change discussed here. Otherwise, this would be an empty diff.

After this merge only Mandrel-specific diffs are present in the release tree which aren't in the
upstream community-jdk21u repo.

jerboaa and others added 14 commits August 26, 2024 15:01
Don't allow null values to be passed to the `register` method of
`RuntimeJNIAccess` and `RuntimeReflection`. Since these are public APIs
GraalVM should either handle null values (by ignoring them in this case)
or throw a `NullPointerException` before creating an asynchronous task
to perform the registration in the analysis, which then results in
`NullPointerException`s being thrown later when it's no longer possible
to understand where the null value originate from.

(cherry picked from commit e6c12dd)
(cherry picked from commit d621dbd)
Not before the register methods, which can miss cases, nor later on in a runnable.

(cherry picked from commit f94551a)
(cherry picked from commit c949f3e)
Partial backport of [GR-48529] Use the API flag in the init hint
…xes-backport

Backport: [GR-49816] Throw exception for null pointers passed to RuntimeJNIAccess / RuntimeReflection register methods
This is a no-op change, but makes downstream Mandrel 23.1
be in sync with the upstream community repo. It makes it
easier to spot any downstream only patches if the diff
to upstream is minimal.
@jerboaa jerboaa requested a review from zakkak August 27, 2024 12:27
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Aug 27, 2024
@jerboaa
Copy link
Collaborator Author

jerboaa commented Aug 27, 2024

FYI, the remainder of the diff to the upstream repo is (all are Mandrel related, so I consider this the minimal diff):
https://paste.centos.org/view/5fd02453

@zakkak
Copy link
Collaborator

zakkak commented Aug 27, 2024

FYI, the remainder of the diff to the upstream repo is (all are Mandrel related, so I consider this the minimal diff): https://paste.centos.org/view/5fd02453

I agree, the only things we need to apply upstream are the checkout github action version bump and the version bump of GraalVM itself.

@jerboaa
Copy link
Collaborator Author

jerboaa commented Aug 27, 2024

FYI, the remainder of the diff to the upstream repo is (all are Mandrel related, so I consider this the minimal diff): https://paste.centos.org/view/5fd02453

I agree, the only things we need to apply upstream are the checkout github action version bump and the version bump of GraalVM itself.

OK.

@jerboaa
Copy link
Collaborator Author

jerboaa commented Aug 27, 2024

FYI, the remainder of the diff to the upstream repo is (all are Mandrel related, so I consider this the minimal diff): https://paste.centos.org/view/5fd02453

I agree, the only things we need to apply upstream are the checkout github action version bump and the version bump of GraalVM itself.

Done with these:
graalvm/graalvm-community-jdk21u#18
graalvm/graalvm-community-jdk21u#19

@zakkak zakkak merged commit a6f6cca into graalvm:mandrel/23.1 Aug 27, 2024
42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants