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

8254365: ciMethod.hpp should not include methodHandles.hpp #623

Conversation

iklam
Copy link
Member

@iklam iklam commented Oct 13, 2020

ciMethod.hpp includes methodHandles.hpp. This is probably a typo as ciMethod.hpp doesn't use the MethodHandles class. Instead, it uses methodHandle which is declared in runtime/handles.hpp.

As usual, I had to fix a few .cpp files that used the MethodHandles class but did not explicitly include methodHandles.hpp.

Tested with mach5 build tiers 1-5.


Progress

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

Issue

  • JDK-8254365: ciMethod.hpp should not include methodHandles.hpp

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 13, 2020

👋 Welcome back iklam! 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 Oct 13, 2020

@iklam 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.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Oct 13, 2020
@iklam iklam marked this pull request as ready for review October 13, 2020 06:45
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 13, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 13, 2020

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Seems okay. There are a couple of changes unrelated to the bug synopsis. :)

Thanks,
David

@openjdk
Copy link

openjdk bot commented Oct 13, 2020

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

8254365: ciMethod.hpp should not include methodHandles.hpp

Reviewed-by: dholmes, coleenp

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

  • d50e0de: 8254722: bsd_zero builds broken after JDK-8253717

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 13, 2020
@iklam
Copy link
Member Author

iklam commented Oct 13, 2020

Seems okay. There are a couple of changes unrelated to the bug synopsis. :)

Thanks,
David

There are 2 things that I didn't mention:

  • java.cpp needs vmThread.hpp (for the zero build only) after this fix. vmThread.hpp used to be recursively included via methodHandles.hpp -> entry_zero.hpp -> zeroInterpreter.hpp -> abstractInterpreter.hpp -> vmThread.hpp.
  • ciEnv.hpp needs systemDictionary.hpp after this fix. systemDictionary.hpp used to be recursively included via methodHandles.hpp.

@iklam
Copy link
Member Author

iklam commented Oct 14, 2020

/integrate

@openjdk openjdk bot closed this Oct 14, 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 14, 2020
@openjdk
Copy link

openjdk bot commented Oct 14, 2020

@iklam Since your change was applied there has been 1 commit pushed to the master branch:

  • d50e0de: 8254722: bsd_zero builds broken after JDK-8253717

Your commit was automatically rebased without conflicts.

Pushed as commit a098037.

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

Successfully merging this pull request may close these issues.

3 participants