Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.
/ jdk22u Public archive

8330094: RISC-V: Save and restore FRM in the call stub #174

Closed
wants to merge 2 commits into from

Conversation

zifeihan
Copy link
Member

@zifeihan zifeihan commented Apr 30, 2024

Hi, The same issue also exists in jdk22u. So I would like to backport JDK-8330094 to jdk22u. With this change, we save and restore the default floating-point control state when we enter and leave Java code, ensuring that we are still Java compatible if we're called via the JNI invocation interface with a weird FP control state. RISC-V specific change, risk is low.
The backport is not clean because jdk22u has no JDK-8321021

Testing

  • Run tier1-3 tests on SOPHON SG2042 (release)

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8330094 needs maintainer approval

Issue

  • JDK-8330094: RISC-V: Save and restore FRM in the call stub (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk22u.git pull/174/head:pull/174
$ git checkout pull/174

Update a local copy of the PR:
$ git checkout pull/174
$ git pull https://git.openjdk.org/jdk22u.git pull/174/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 174

View PR using the GUI difftool:
$ git pr show -t 174

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk22u/pull/174.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 30, 2024

👋 Welcome back gcao! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Apr 30, 2024

@zifeihan This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8330094: RISC-V: Save and restore FRM in the call stub

Reviewed-by: fyang

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

  • 5c15483: 8326201: [S390] Need to bailout cleanly if creation of stubs fails when code cache is out of space
  • e96e6ab: 8329850: [AIX] Allow loading of different members of same shared library archive
  • d2e1ea4: 8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealFYang) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport b0496096dc8d7dc7acf28aa006141a3ecea446de 8330094: RISC-V: Save and restore FRM in the call stub Apr 30, 2024
@openjdk
Copy link

openjdk bot commented Apr 30, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Apr 30, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 30, 2024

Webrevs

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented May 1, 2024

⚠️ @zifeihan This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label May 1, 2024
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels May 2, 2024
@zifeihan
Copy link
Member Author

zifeihan commented May 4, 2024

@RealFYang : Thanks for the review.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 4, 2024
@openjdk
Copy link

openjdk bot commented May 4, 2024

@zifeihan
Your change (at version 4be7be7) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented May 5, 2024

Going to push as commit beb06e1.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 5c15483: 8326201: [S390] Need to bailout cleanly if creation of stubs fails when code cache is out of space
  • e96e6ab: 8329850: [AIX] Allow loading of different members of same shared library archive
  • d2e1ea4: 8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 5, 2024
@openjdk openjdk bot closed this May 5, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels May 5, 2024
@openjdk
Copy link

openjdk bot commented May 5, 2024

@RealFYang @zifeihan Pushed as commit beb06e1.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants