Skip to content

Conversation

@DamonFool
Copy link
Member

@DamonFool DamonFool commented Dec 8, 2021

Hi all,

Zero VM is broken due to UseRTMForStackLocks was not declared after JDK-8276901.
Please review this fix.

Thanks.
Best regards,
Jie


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8278379: Zero VM is broken due to UseRTMForStackLocks was not declared after JDK-8276901

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6753/head:pull/6753
$ git checkout pull/6753

Update a local copy of the PR:
$ git checkout pull/6753
$ git pull https://git.openjdk.java.net/jdk pull/6753/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6753

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6753.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 8, 2021

👋 Welcome back jiefu! 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 openjdk bot added the rfr Pull request is ready for review label Dec 8, 2021
@openjdk
Copy link

openjdk bot commented Dec 8, 2021

@DamonFool The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Dec 8, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 8, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Hi Jie,

This code needs to be changed for other reasons (my email has not gotten to the mailing list yet - seems to be some kind of outage), but this fix for zero seems fine.

Thanks,
David

@openjdk
Copy link

openjdk bot commented Dec 8, 2021

@DamonFool 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:

8278379: Zero VM is broken due to UseRTMForStackLocks was not declared after JDK-8276901

Reviewed-by: dholmes, shade

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 4 new commits pushed to the master branch:

  • e7db581: 8277168: AArch64: Enable arraycopy partial inlining with SVE
  • fb6d611: 8278276: G1: Refine naming of G1GCParPhaseTimesTracker::_must_record
  • d7ad546: 8276422: Add command-line option to disable finalization
  • ec7cb6d: 8276447: Deprecate finalization-related methods for removal

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 added the ready Pull request is ready to be integrated label Dec 8, 2021
@DamonFool
Copy link
Member Author

Hi Jie,

This code needs to be changed for other reasons (my email has not gotten to the mailing list yet - seems to be some kind of outage), but this fix for zero seems fine.

Thanks, David

Thanks @dholmes-ora .

So do you think it's trivial?

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine and trivial.

@DamonFool
Copy link
Member Author

Looks fine and trivial.

Thanks @shipilev .
So integrate it.

/integrate

@openjdk
Copy link

openjdk bot commented Dec 8, 2021

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

  • e7db581: 8277168: AArch64: Enable arraycopy partial inlining with SVE
  • fb6d611: 8278276: G1: Refine naming of G1GCParPhaseTimesTracker::_must_record
  • d7ad546: 8276422: Add command-line option to disable finalization
  • ec7cb6d: 8276447: Deprecate finalization-related methods for removal

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 8, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 8, 2021
@openjdk
Copy link

openjdk bot commented Dec 8, 2021

@DamonFool Pushed as commit 5266e7d.

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

@DamonFool DamonFool deleted the JDK-8278379 branch December 8, 2021 06:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants