8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops* #8356

zhengxiaolinX · 2022-04-22T07:26:54Z

Trivial and same as JDK-8283737: in fastdebug build, MacroAssembler::verify_oop is used in match rules encodeHeapOop and decodeHeapOop, which also requires a fixed length.

Logs are inside the JBS issue, and this issue could be reproduced by using -XX:+VerifyOops.

Tested using -XX:+VerifyOops and a hotspot tier1 on qemu.

Thanks,
Xiaolin

Progress

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

Issue

JDK-8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops*

Reviewers

Aleksey Shipilev (@shipilev - Reviewer) ⚠️ Review applies to f52442b
Fei Yang (@RealFYang - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8356

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

Using diff file

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

bridgekeeper · 2022-04-22T07:27:55Z

👋 Welcome back xlinzheng! 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 · 2022-04-22T07:29:49Z

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

hotspot

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.

mlbridge · 2022-04-22T07:34:10Z

Webrevs

01: Full - Incremental (61166a48)
00: Full (f52442b6)

zhengxiaolinX · 2022-04-22T07:42:16Z

/label hotspot-compiler
/label remove hotspot
/cc hotspot-compiler

openjdk · 2022-04-22T07:43:17Z

@zhengxiaolinX
The hotspot-compiler label was successfully added.

openjdk · 2022-04-22T07:44:41Z

@zhengxiaolinX
The hotspot label was successfully removed.

openjdk · 2022-04-22T07:46:00Z

@zhengxiaolinX The hotspot-compiler label was already applied.

shipilev

Looks fine.

openjdk · 2022-04-22T08:12:56Z

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

8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops*

Reviewed-by: shade, 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 13 new commits pushed to the master branch:

08024d9: 8193543: Regression automated test '/open/test/jdk/java/awt/TrayIcon/SystemTrayInstance/SystemTrayInstanceTest.java' fails
a1efb95: 8129827: [TEST_BUG] Test java/awt/Robot/RobotWheelTest/RobotWheelTest.java fails
03cbb48: 8285445: cannot open file "NUL:"
e9d604a: 8285431: Assertion in NativeGSSContext constructor
357b1b1: 8242440: use separate, destroyable JavaVM instances per libgraal compiler thread
b10833b: 8285303: riscv: Incorrect register mask in call_native_base
ce8db2c: 8285394: Compiler blackholes can be eliminated due to stale ciMethod::intrinsic_id()
4e252cf: 8285370: Fix typo in jdk.charsets
d8025c9: 8285362: unify os::pause platform coding
82f0ac0: 8284995: G1: Do not mark through Closed Archive regions during concurrent mark
... and 3 more: https://git.openjdk.java.net/jdk/compare/d84b9c54893dd33686d49755fca7a4b7f6a681c4...master

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 (@shipilev, @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).

RealFYang

Looks good.

zhengxiaolinX · 2022-04-22T08:22:26Z

Thank you for the quick reviews! Then move on.

/integrate

openjdk · 2022-04-22T08:23:55Z

@zhengxiaolinX
Your change (at version f52442b) is now ready to be sponsored by a Committer.

RealFYang · 2022-04-22T23:52:38Z

PS: Could you please add some code comment like fix for JDK-8283737 ?
I can sponsor after that.

zhengxiaolinX · 2022-04-23T03:22:28Z

PS: Could you please add some code comment like fix for JDK-8283737 ? I can sponsor after that.

Thank you, Felix. This is very reasonable. Added and hope they look good.

RealFYang

Code comment looks good. Thanks.

zhengxiaolinX · 2022-04-24T02:13:54Z

/integrate

openjdk · 2022-04-24T02:15:24Z

@zhengxiaolinX
Your change (at version 61166a4) is now ready to be sponsored by a Committer.

RealFYang · 2022-04-24T02:15:32Z

/sponsor

openjdk · 2022-04-24T02:17:11Z

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

08024d9: 8193543: Regression automated test '/open/test/jdk/java/awt/TrayIcon/SystemTrayInstance/SystemTrayInstanceTest.java' fails
a1efb95: 8129827: [TEST_BUG] Test java/awt/Robot/RobotWheelTest/RobotWheelTest.java fails
03cbb48: 8285445: cannot open file "NUL:"
e9d604a: 8285431: Assertion in NativeGSSContext constructor
357b1b1: 8242440: use separate, destroyable JavaVM instances per libgraal compiler thread
b10833b: 8285303: riscv: Incorrect register mask in call_native_base
ce8db2c: 8285394: Compiler blackholes can be eliminated due to stale ciMethod::intrinsic_id()
4e252cf: 8285370: Fix typo in jdk.charsets
d8025c9: 8285362: unify os::pause platform coding
82f0ac0: 8284995: G1: Do not mark through Closed Archive regions during concurrent mark
... and 3 more: https://git.openjdk.java.net/jdk/compare/d84b9c54893dd33686d49755fca7a4b7f6a681c4...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-04-24T02:17:30Z

@RealFYang @zhengxiaolinX Pushed as commit 9d9f4e5.

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

Fix again: MachNode size mismatch

f52442b

openjdk bot added the rfr Pull request is ready for review label Apr 22, 2022

openjdk bot added the hotspot hotspot-dev@openjdk.org label Apr 22, 2022

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Apr 22, 2022

openjdk bot removed the hotspot hotspot-dev@openjdk.org label Apr 22, 2022

shipilev approved these changes Apr 22, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 22, 2022

RealFYang approved these changes Apr 22, 2022

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 22, 2022

Add some comments

61166a4

openjdk bot removed the sponsor Pull request is ready to be sponsored label Apr 23, 2022

RealFYang approved these changes Apr 23, 2022

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 24, 2022

openjdk bot added the integrated Pull request has been integrated label Apr 24, 2022

openjdk bot closed this Apr 24, 2022

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 Apr 24, 2022

zhengxiaolinX deleted the 1-machnode branch April 24, 2022 02:18

8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops* #8356

8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops* #8356

Uh oh!

Conversation

zhengxiaolinX commented Apr 22, 2022 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Apr 22, 2022

Uh oh!

openjdk bot commented Apr 22, 2022

Uh oh!

mlbridge bot commented Apr 22, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

zhengxiaolinX commented Apr 22, 2022

Uh oh!

openjdk bot commented Apr 22, 2022

Uh oh!

openjdk bot commented Apr 22, 2022

Uh oh!

openjdk bot commented Apr 22, 2022

Uh oh!

shipilev left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Apr 22, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RealFYang left a comment

Choose a reason for hiding this comment

Uh oh!

zhengxiaolinX commented Apr 22, 2022

Uh oh!

openjdk bot commented Apr 22, 2022

Uh oh!

RealFYang commented Apr 22, 2022

Uh oh!

zhengxiaolinX commented Apr 23, 2022

Uh oh!

RealFYang left a comment

Choose a reason for hiding this comment

Uh oh!

zhengxiaolinX commented Apr 24, 2022

Uh oh!

openjdk bot commented Apr 24, 2022

Uh oh!

RealFYang commented Apr 24, 2022

Uh oh!

openjdk bot commented Apr 24, 2022

Uh oh!

openjdk bot commented Apr 24, 2022

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

zhengxiaolinX commented Apr 22, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Apr 22, 2022 •

edited

Loading

openjdk bot commented Apr 22, 2022 •

edited

Loading