Skip to content

Conversation

@dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Apr 9, 2024

JDK-8325303 changed a number of occurrences of is_neutral to is_unlocked, but one change in basicLock.cpp should not have been changed as it relates to the displaced markword.

This is a trivial change.

Testing:

  • tiers 1-3 (sanity)

Thanks


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

Issue

  • JDK-8329898: Revert one use of markWord.is_unlocked back to is_neutral (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18684

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/18684.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 9, 2024

👋 Welcome back dholmes! 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 9, 2024

@dholmes-ora 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:

8329898: Revert one use of markWord.is_unlocked back to is_neutral

Reviewed-by: stefank

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 rfr Pull request is ready for review label Apr 9, 2024
@openjdk
Copy link

openjdk bot commented Apr 9, 2024

@dholmes-ora 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 Apr 9, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 9, 2024

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 9, 2024
@dholmes-ora
Copy link
Member Author

Thanks for the review @stefank

/integrate

@openjdk
Copy link

openjdk bot commented Apr 9, 2024

Going to push as commit dfaf11a.

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

openjdk bot commented Apr 9, 2024

@dholmes-ora Pushed as commit dfaf11a.

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

@dholmes-ora dholmes-ora deleted the 8329898-markword branch July 10, 2025 23:15
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.

2 participants