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

8256172: Clean up CDS handling of i2i_entry #1280

Closed
wants to merge 3 commits into from

Conversation

iklam
Copy link
Member

@iklam iklam commented Nov 18, 2020

This PR is a prerequisite for JDK-8250989 - Consolidate buffer allocation code for CDS static/dynamic archive dumping.

  • Move the allocation of the i2i buffer after all classes are loaded. This makes it possible to estimate the size of the CDS archive before we allocate the output space (this is what dynamic archive does now).
  • No need to generate the i2i trampoline code during -Xshare:dump
  • Clean up the CDS code in abstractInterpreter.cpp and add more comments.

Progress

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

Issue

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 18, 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 Nov 18, 2020

@iklam The following label will be automatically applied to this pull request:

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Nov 18, 2020
@iklam iklam marked this pull request as ready for review November 18, 2020 00:38
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 18, 2020
@mlbridge
Copy link

mlbridge bot commented Nov 18, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 18, 2020

@iklam this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8256172-cleanup-cds-i2i-entry
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Nov 18, 2020
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Nov 18, 2020
void MetaspaceShared::init_misc_code_space() {
// We don't want any valid object to be at the very bottom of the archive.
// See ArchivePtrMarker::mark_pointer().
MetaspaceShared::misc_code_space_alloc(16);
Copy link
Contributor

Choose a reason for hiding this comment

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

16 looks arbitrary number though we know it is minimal object alignment --- maybe we we can use object_alignment instead? up to you.

Copy link
Member Author

Choose a reason for hiding this comment

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

16 is just an arbitrary small number. MetaspaceShared::misc_code_space_alloc(16) will round up the size to the appropriate alignment. So I think I'll keep the existing code.

Copy link
Contributor

@yminqi yminqi left a comment

Choose a reason for hiding this comment

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

Look good to me.

@openjdk
Copy link

openjdk bot commented Nov 18, 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:

8256172: Clean up CDS handling of i2i_entry

Reviewed-by: minqi, ccheung

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

  • cfa92a5: 8256178: Add RAII object for file lock
  • 2b15571: 8256383: PlatformMutex::try_lock has different semantics on Windows and Posix
  • 99eac53: 8225631: Consider replacing muxAcquire/Release with PlatformMonitor
  • 646c200: 8256152: tests fail because of ambiguous method resolution
  • 5912df2: 8256427: Test com/sun/jndi/dns/ConfigTests/PortUnreachable.java does not work on AIX
  • 3110d58: 8256538: Fix annoying awk warning in configure for java versions
  • 03e84ef: 8256189: Exact VarHandle tests should test withInvokeBehavior() works as expected
  • 300cbaa: 8256418: Jittester make build is broken.
  • c9c1573: 8256567: ProblemList java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java for Xcomp testing

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 Nov 18, 2020
Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Cleanup looks good.

@iklam
Copy link
Member Author

iklam commented Nov 19, 2020

Thanks @calvinccheung and @yminqi for the review.
/integrate

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

openjdk bot commented Nov 19, 2020

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

  • cfa92a5: 8256178: Add RAII object for file lock
  • 2b15571: 8256383: PlatformMutex::try_lock has different semantics on Windows and Posix
  • 99eac53: 8225631: Consider replacing muxAcquire/Release with PlatformMonitor
  • 646c200: 8256152: tests fail because of ambiguous method resolution
  • 5912df2: 8256427: Test com/sun/jndi/dns/ConfigTests/PortUnreachable.java does not work on AIX
  • 3110d58: 8256538: Fix annoying awk warning in configure for java versions
  • 03e84ef: 8256189: Exact VarHandle tests should test withInvokeBehavior() works as expected
  • 300cbaa: 8256418: Jittester make build is broken.
  • c9c1573: 8256567: ProblemList java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java for Xcomp testing

Your commit was automatically rebased without conflicts.

Pushed as commit 4178834.

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

openjdk-notifier bot referenced this pull request Nov 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants