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

8255038: Adjust adapter_code_size to account for -Xlog:methodhandles in debug builds #761

Closed
wants to merge 1 commit into from

Conversation

cl4es
Copy link
Member

@cl4es cl4es commented Oct 20, 2020

https://bugs.openjdk.java.net/browse/JDK-8254955 trimmed the space allocated for MethodHandleAdapterBlob, but my analysis failed to account for added trace code information being generated when running with -Xlog:methodhandles (on top of the extra tracing/debugging when running with -XX:+VerifyMethodHandles et.c.). This caused a failure in tier3 Windows ZGC tests.

Adjusting the debug size up a notch ensures we stay within bounds.

Testing: tier3


Progress

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

Testing

Linux x32 Linux x64 Windows x64 macOS x64
Build ✔️ (1/1 passed) ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ❌ (1/9 failed) ✔️ (9/9 passed)

Failed test task

Issue

  • JDK-8255038: Adjust adapter_code_size to account for -Xlog:methodhandles in debug builds

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/761/head:pull/761
$ git checkout pull/761

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 20, 2020

👋 Welcome back redestad! 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 Pull request is ready for review label Oct 20, 2020
@openjdk
Copy link

openjdk bot commented Oct 20, 2020

@cl4es 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 hotspot-compiler-dev@openjdk.org label Oct 20, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 20, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 20, 2020

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

8255038: Adjust adapter_code_size to account for -Xlog:methodhandles in debug builds

Reviewed-by: shade, neliasso

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

  • cdc8c40: 8254878: Move last piece of ZArray to GrowableArray
  • 294e070: 8254998: C2: assert(!n->as_Loop()->is_transformed_long_loop()) failure with -XX:StressLongCountedLoop=1
  • 3ee0380: 8234393: [macos] printing ignores printer tray

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 Pull request is ready to be integrated label Oct 20, 2020
Copy link

@neliasso neliasso left a comment

Choose a reason for hiding this comment

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

Looks good and trivial

@cl4es
Copy link
Member Author

cl4es commented Oct 20, 2020

@shipilev @neliasso: thank you for reviewing!

/integrate

@openjdk
Copy link

openjdk bot commented Oct 20, 2020

@cl4es Your integration request cannot be fulfilled at this time, as the status check jcheck is still in progress

@cl4es
Copy link
Member Author

cl4es commented Oct 20, 2020

/integrate

@openjdk openjdk bot closed this Oct 20, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 20, 2020
@openjdk
Copy link

openjdk bot commented Oct 20, 2020

@cl4es Since your change was applied there have been 3 commits pushed to the master branch:

  • cdc8c40: 8254878: Move last piece of ZArray to GrowableArray
  • 294e070: 8254998: C2: assert(!n->as_Loop()->is_transformed_long_loop()) failure with -XX:StressLongCountedLoop=1
  • 3ee0380: 8234393: [macos] printing ignores printer tray

Your commit was automatically rebased without conflicts.

Pushed as commit 76fdd7f.

💡 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
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants