Skip to content

Conversation

@earthling-amzn
Copy link
Contributor

@earthling-amzn earthling-amzn commented Apr 25, 2025

Conflict in risc-v code, trivial resolution.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 Committer)

Issues

  • JDK-8343468: GenShen: Enable relocation of remembered set card tables (Enhancement - P4)
  • JDK-8351456: Build failure with --disable-jvm-feature-shenandoahgc after 8343468 (Bug - P2)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/shenandoah-jdk21u.git pull/186/head:pull/186
$ git checkout pull/186

Update a local copy of the PR:
$ git checkout pull/186
$ git pull https://git.openjdk.org/shenandoah-jdk21u.git pull/186/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 186

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/shenandoah-jdk21u/pull/186.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 25, 2025

👋 Welcome back wkemper! 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 25, 2025

@earthling-amzn 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:

8343468: GenShen: Enable relocation of remembered set card tables
8351456: Build failure with --disable-jvm-feature-shenandoahgc after 8343468

Reviewed-by: kdnilsen, ysr

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 1 new commit pushed to the master branch:

  • 9fafafa: 8354452: Shenandoah: Enforce range checks on parameters controlling heuristic sleep times

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title Backport 4e1367e34be724a0f84069100854c38333610714 8343468: GenShen: Enable relocation of remembered set card tables Apr 25, 2025
@openjdk
Copy link

openjdk bot commented Apr 25, 2025

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Apr 25, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 25, 2025

Webrevs

@earthling-amzn
Copy link
Contributor Author

/issues add 8351456

@openjdk
Copy link

openjdk bot commented Apr 28, 2025

@earthling-amzn Unknown command issues - for a list of valid commands use /help.

@earthling-amzn
Copy link
Contributor Author

/issue add 8351456

@openjdk
Copy link

openjdk bot commented Apr 28, 2025

@earthling-amzn
Adding additional issue to issue list: 8351456: Build failure with --disable-jvm-feature-shenandoahgc after 8343468.

Copy link
Contributor

@kdnilsen kdnilsen left a comment

Choose a reason for hiding this comment

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

Thanks for the backport

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 29, 2025
@earthling-amzn
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 29, 2025

Going to push as commit ef9d467.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 9fafafa: 8354452: Shenandoah: Enforce range checks on parameters controlling heuristic sleep times

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 29, 2025
@openjdk openjdk bot closed this Apr 29, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 29, 2025
@openjdk
Copy link

openjdk bot commented Apr 29, 2025

@earthling-amzn Pushed as commit ef9d467.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants