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

8248186: Move CDS C++ vtable code to cppVtables.cpp #136

Closed
wants to merge 2 commits into from

Conversation

iklam
Copy link
Member

@iklam iklam commented Sep 11, 2020

I moved the code that supports C++ vtables in the CDS archive from metaspaceShared.cpp to a new file, cppVtables.cpp. To keep the refactoring straightforward, the code is moved verbatim, except for:

  • Methods are renamed from MetaspaceShared::xx to CppVtables::xx
  • Access to _mc_region is changed to the inline function mc_region()

Progress

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

Issue

  • JDK-8248186: Move CDS C++ vtable code to cppVtables.cpp

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 11, 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 openjdk bot commented Sep 11, 2020

@iklam The following labels will be automatically applied to this pull request: build hotspot.

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 (add|remove) "label" command.

@openjdk openjdk bot added build hotspot labels Sep 11, 2020
@iklam
Copy link
Member Author

@iklam iklam commented Sep 11, 2020

/label remove build,hotspot

@openjdk openjdk bot removed build hotspot labels Sep 11, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2020

@iklam
The build label was successfully removed.

The hotspot label was successfully removed.

@iklam
Copy link
Member Author

@iklam iklam commented Sep 11, 2020

/label add hotspot-runtime

@openjdk openjdk bot added the hotspot-runtime label Sep 11, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2020

@iklam
The hotspot-runtime label was successfully added.

@iklam iklam marked this pull request as ready for review Sep 11, 2020
@openjdk openjdk bot added the rfr label Sep 11, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 11, 2020

Webrevs

#include "oops/instanceClassLoaderKlass.hpp"
#include "oops/instanceMirrorKlass.hpp"
#include "oops/instanceRefKlass.hpp"
#include "oops/methodData.hpp"
Copy link
Contributor

@coleenp coleenp Sep 11, 2020

Choose a reason for hiding this comment

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

Did you check that you needed all of these #include files?

Copy link
Member Author

@iklam iklam Sep 11, 2020

Choose a reason for hiding this comment

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

Yes, I started with no headers and kept adding until gcc stopped complaining. I was using a non-PCH build.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2020

@iklam This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

8248186: Move CDS C++ vtable code to cppVtables.cpp

Reviewed-by: coleenp
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

There are currently no new commits on the master branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate 03a4df0acd103702e52dcd01c3f03fda4d7b04f5.

➡️ 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 label Sep 11, 2020
@iklam
Copy link
Member Author

@iklam iklam commented Sep 13, 2020

/integrate

@openjdk openjdk bot closed this Sep 13, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 13, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2020

@iklam Pushed as commit c5e63b6.

💡 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-runtime integrated
2 participants