Skip to content
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

8317957: [Lilliput/JDK17] Make C2 LoadNKlassCompactHeader more robust #57

Closed
wants to merge 6 commits into from

Conversation

rkennke
Copy link
Collaborator

@rkennke rkennke commented Oct 11, 2023

Backport of openjdk/lilliput#111. I needed to extract the body into helper methods in order to match mainline version. Other than that, the changes are identical.

Lilliput's C2 code for generating LoadNKlass currently assumes that the disp of the incoming address is klass_offset_in_bytes. It then extracts the base register and loads from the mark_offset_in_bytes instead.
Sometimes (apparently very rarely) it happens that C2 emits code that pre-adds obj+klass_offset into a register, and uses that as base, but with offset 0. In this case we would trip the assert or crash in release builds.

  • specjvm derby (which triggered the bug)
  • tier1 x86_64 +UCOH
  • tier1 aarch64 +UCOH

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-8317957: [Lilliput/JDK17] Make C2 LoadNKlassCompactHeader more robust (Bug - P2)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/lilliput-jdk17u.git pull/57/head:pull/57
$ git checkout pull/57

Update a local copy of the PR:
$ git checkout pull/57
$ git pull https://git.openjdk.org/lilliput-jdk17u.git pull/57/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 57

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/lilliput-jdk17u/pull/57.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 11, 2023

👋 Welcome back rkennke! A progress list of the required criteria for merging this PR into lilliput 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 Oct 11, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 11, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 11, 2023

⚠️ @rkennke This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk
Copy link

openjdk bot commented Oct 12, 2023

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

8317957: [Lilliput/JDK17] Make C2 LoadNKlassCompactHeader more robust

Reviewed-by: 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 no new commits pushed to the lilliput 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 lilliput branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 12, 2023
@rkennke
Copy link
Collaborator Author

rkennke commented Oct 12, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 12, 2023

Going to push as commit ad69ec5.

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

openjdk bot commented Oct 12, 2023

@rkennke Pushed as commit ad69ec5.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants