Skip to content
This repository has been archived by the owner. It is now read-only.

8269614: [s390] Interpreter checks wrong bit for slow path instance allocation #177

Closed
wants to merge 1 commit into from
Closed

8269614: [s390] Interpreter checks wrong bit for slow path instance allocation #177

wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 29, 2021

This is a small fix for a bug in the template interpreter on s390. Klass::_lh_instance_slow_path_bit is the bit to check, not the bit position. (See other platforms.)


Progress

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

Issue

  • JDK-8269614: [s390] Interpreter checks wrong bit for slow path instance allocation

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 177

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 29, 2021

👋 Welcome back mdoerr! 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 label Jun 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 29, 2021

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

  • hotspot-compiler

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-compiler label Jun 29, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 29, 2021

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

That looks fairly simple: _lh_instance_slow_path_bit is already the mask.

@openjdk
Copy link

@openjdk openjdk bot commented Jun 29, 2021

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

8269614: [s390] Interpreter checks wrong bit for slow path instance allocation

Reviewed-by: shade, rrich

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

  • ca283c3: 8265907: JVM crashes when matching VectorMaskCmp Node
  • c3c9189: 8269141: Switch statement containing pattern case label element gets in the loop during execution
  • 6b64a79: 8268350: Remove assert that ensures thread identifier remains the same
  • 90eb118: 8269528: VectorAPI Long512VectorTest fails on X86 KNL target
  • a661686: 8269065: [REDO] vmTestbase/vm/mlvm/anonloader/stress/oome/metaspace/Test.java failed with OutOfMemoryError
  • 0d745ae: 8269034: AccessControlException for SunPKCS11 daemon threads
  • d042029: 8269529: javax/swing/reliability/HangDuringStaticInitialization.java fails in Windows debug build

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 label Jun 29, 2021
Copy link
Contributor

@reinrich reinrich left a comment

Wrong since 2013/05/23. Looks good now.

Cheers, Richard.

@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Jun 30, 2021

Thanks for the reviews!
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jun 30, 2021

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

  • 4b4bef4: 8269594: assert(_handle_mark_nesting > 1) failed: memory leak: allocating handle outside HandleMark
  • 4ee400a: 8268320: Better error recovery for broken patterns in switch
  • ca283c3: 8265907: JVM crashes when matching VectorMaskCmp Node
  • c3c9189: 8269141: Switch statement containing pattern case label element gets in the loop during execution
  • 6b64a79: 8268350: Remove assert that ensures thread identifier remains the same
  • 90eb118: 8269528: VectorAPI Long512VectorTest fails on X86 KNL target
  • a661686: 8269065: [REDO] vmTestbase/vm/mlvm/anonloader/stress/oome/metaspace/Test.java failed with OutOfMemoryError
  • 0d745ae: 8269034: AccessControlException for SunPKCS11 daemon threads
  • d042029: 8269529: javax/swing/reliability/HangDuringStaticInitialization.java fails in Windows debug build

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 30, 2021
@openjdk openjdk bot added the integrated label Jun 30, 2021
@TheRealMDoerr TheRealMDoerr deleted the 8269614_s390_interp branch Jun 30, 2021
@openjdk openjdk bot removed ready rfr labels Jun 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 30, 2021

@TheRealMDoerr Pushed as commit be0ac92.

💡 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
hotspot-compiler integrated
3 participants