Skip to content

8359920: Use names for frame types in stackmaps #25870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jun 18, 2025

This uses names for frame types for stackmaps in the verifier and redefinition.
Tested with tier1-7.


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-8359920: Use names for frame types in stackmaps (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25870

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 18, 2025

👋 Welcome back coleenp! 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 Jun 18, 2025

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

8359920: Use names for frame types in stackmaps

Reviewed-by: matsaave, jsjolen, sspitsyn

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 50 new commits pushed to 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 rfr Pull request is ready for review label Jun 18, 2025
@openjdk
Copy link

openjdk bot commented Jun 18, 2025

@coleenp The following labels will be automatically applied to this pull request:

  • hotspot
  • serviceability

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

@mlbridge
Copy link

mlbridge bot commented Jun 18, 2025

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 18, 2025
Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

Comment on lines 152 to 154
SAME_FRAME = 64,
SAME_LOCALS_1_STACK_ITEM_FRAME = 128,
SAME_LOCALS_1_STACK_ITEM_EXTENDED = 247,
Copy link
Member

Choose a reason for hiding this comment

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

I find these definitions a little confusing. SAME_FRAME is actually 0-63, with SAME_LOCALS_1_STACK_ITEM_FRAME being 64-127. Given many of these frame types imply tag ranges it may be clearer to define enum's for the start and end of ranges as applicable eg.

enum {
  SAME_FRAME_START = 0,
  SAME_FRAME_END = 63,
  SAME_LOCALS_1_STACK_ITEM_FRAME_START = 64,
  SAME_LOCALS_1_STACK_ITEM_FRAME_END = 127,
  RESERVED_START = 128,
  RESERVED_END = 246,
  SAME_LOCALS_1_STACK_ITEM_EXTENDED = 247,
  CHOP_FRAME_START = 248,
  CHOP_FRAME_END = 250,
  SAME_FRAME_EXTENDED = 251,
  APPEND_FRAME_START = 252,
  APPEND_FRAME_END = 254,
  FULL_FRAME = 255
}

and then adjust the code usage as appropriate e.g.

if (frame_type <= SAME_FRAME_END) {
...
if (frame_type <= SAME_LOCALS_1_STACK_ITEM_FRAME_END) {
  if (_first) {
    offset = frame_type - SAME_LOCALS_1_STACK_ITEM_FRAME_START;
...

What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't really up for a big rewrite but having the complete set of names would be really good.

Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

This looks good.
I was also thinking about frame_type ranges but no ideas on any improvements.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jun 20, 2025
@coleenp
Copy link
Contributor Author

coleenp commented Jun 20, 2025

tiers 1-4 passed with changes suggested by @dholmes-ora

Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

Updated change looks good!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot [email protected] ready Pull request is ready to be integrated rfr Pull request is ready for review serviceability [email protected]
Development

Successfully merging this pull request may close these issues.

5 participants