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

8256955: Move includes of events.hpp out of header files #2059

Closed
wants to merge 1 commit into from

Conversation

stefank
Copy link
Member

@stefank stefank commented Jan 13, 2021

I was making changes to events.hpp and saw that the majority of cpp files were recompiled. There are two header files that include events.hpp. I propose that we remove those usages by:

jvmci.hpp: Use a forward declaration
collectedHeap.hpp: Move its usage to the cpp file

events.hpp also includes thread.hpp, which brings in a large portion of the HotSpot headers. So, this change is also good in that regard.


Progress

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

Issue

  • JDK-8256955: Move includes of events.hpp out of header files

Reviewers

Download

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

@stefank
Copy link
Member Author

stefank commented Jan 13, 2021

/label add hotspot

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 13, 2021

👋 Welcome back stefank! 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 rfr Pull request is ready for review hotspot hotspot-dev@openjdk.org labels Jan 13, 2021
@openjdk
Copy link

openjdk bot commented Jan 13, 2021

@stefank
The hotspot label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Jan 13, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 13, 2021

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

8256955: Move includes of events.hpp out of header files

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

  • ce94512: 8259619: C1: 3-arg StubAssembler::call_RT stack-use condition is incorrect
  • 2e12454: 8259580: Shenandoah: uninitialized label in VerifyThreadGCState
  • 77ca103: 8257236: can't use var with a class named Z

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 Jan 13, 2021
Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Nice!

@coleenp
Copy link
Contributor

coleenp commented Jan 13, 2021

I should have asked if you were able to build shenandoah and zero with this change?

@stefank
Copy link
Member Author

stefank commented Jan 14, 2021

I should have asked if you were able to build shenandoah and zero with this change?

Yes. Built Shenandoah and Zero locally on fastdebug and release.

@stefank
Copy link
Member Author

stefank commented Jan 14, 2021

Thanks for reviewing!

@stefank
Copy link
Member Author

stefank commented Jan 14, 2021

/integrate

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

openjdk bot commented Jan 14, 2021

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

  • 8b8b1f9: 8259706: C2 compilation fails with assert(vtable_index == Method::invalid_vtable_index) failed: correct sentinel value
  • ae9187d: 8256109: Create implementation for NSAccessibilityButton protocol
  • 5513f98: 8258010: Debug build failure with clang-10 due to -Wdeprecated-copy
  • 51e14f2: Merge
  • 5926d75: 8259719: ProblemList runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java on Windows
  • 8abefde: 8259720: ProblemList java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java on Windows
  • fb8ac24: 8259722: ProblemList two jdk/jfr/startupargs tests on Windows
  • ac4cd2e: 8231461: static/instance overload leads to 'unexpected static method found in unbound lookup' when resolving method reference
  • 42d2d6d: 8259063: Possible deadlock with vtable/itable creation vs concurrent class unloading
  • 6bb6093: 8259657: typo in generated HELP page prevents localization
  • ... and 22 more: https://git.openjdk.java.net/jdk/compare/2243a1703b81aba2da0a943fc486e34f635f662c...master

Your commit was automatically rebased without conflicts.

Pushed as commit 3462f7a.

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

@stefank stefank deleted the 8256955_events_hpp branch May 20, 2021 11:10
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
3 participants