Skip to content

8298610: Refactor archiving of ConstantPool::resolved_references() #12021

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

8298610: Refactor archiving of ConstantPool::resolved_references() #12021

wants to merge 2 commits into from

Conversation

iklam
Copy link
Member

@iklam iklam commented Jan 17, 2023 •
edited by openjdk bot
Loading

This is another prerequisite for JDK-8296344.

Before this PR, when archiving the objArray of ConstantPool::resolved_references()

  • We call HeapShared::find_archived_heap_object() to look up archived copies of the Strings.
  • We allocate a copy of the objArray inside a safepoint.

This violates the requirements [1] and [2] as stated in JDK-8298600.

After this PR, we no longer do the above.

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8298610: Refactor archiving of ConstantPool::resolved_references()

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12021/head:pull/12021
$ git checkout pull/12021

Update a local copy of the PR:
$ git checkout pull/12021
$ git pull https://git.openjdk.org/jdk pull/12021/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12021

View PR using the GUI difftool:
$ git pr show -t 12021

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12021.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 17, 2023

👋 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 Jan 17, 2023

@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 Jan 17, 2023
@iklam
Copy link
Member Author

iklam commented Jan 17, 2023

/label remove hotspot
/label add hotspot-runtime

@openjdk openjdk bot removed the hotspot hotspot-dev@openjdk.org label Jan 17, 2023
@openjdk
Copy link

openjdk bot commented Jan 17, 2023

@iklam
The hotspot label was successfully removed.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jan 17, 2023
@openjdk
Copy link

openjdk bot commented Jan 17, 2023

@iklam
The hotspot-runtime label was successfully added.

@iklam iklam marked this pull request as ready for review January 17, 2023 15:37
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 17, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 17, 2023 •
edited
Loading

Webrevs

dholmes-ora
dholmes-ora reviewed Jan 18, 2023
View reviewed changes
src/hotspot/share/cds/heapShared.cpp
// reject objects that may be too large for *any* collector.
assert(UseG1GC, "implementation limitation");
size_t sz = align_up(o->size() * HeapWordSize, ObjectAlignmentInBytes);
size_t max = /*G1*/HeapRegion::min_region_size_in_words() * HeapWordSize;
Copy link
Member

Choose a reason for hiding this comment

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

This code needs to be inside an INCLUDE_G1GC guard does it not?

Copy link
Member Author

Choose a reason for hiding this comment

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

This code is inside #if INCLUDE_CDS_JAVA_HEAP, which is enabled only if INCLUDE_G1GC is defined.

We have other code within INCLUDE_CDS_JAVA_HEAP that unconditionally access G1 APIs. These will be fixed when we remove all dependencies of G1 from the CDS heap dumping code (see JDK-8296344 )

Copy link
Member

Choose a reason for hiding this comment

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

I see - thanks.

dholmes-ora
dholmes-ora approved these changes Jan 19, 2023
View reviewed changes
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.

This seems fine. Thanks.

@openjdk
Copy link

openjdk bot commented Jan 19, 2023 •
edited
Loading

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

8298610: Refactor archiving of ConstantPool::resolved_references()

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

  • f79e587: 8300828: Avoid unnecessary array fill after creation in com.sun.media.sound
  • 56dc3b0: Merge
  • fd75217: 8290919: Update nroff pages in JDK 20 before RC
  • 0ea2dd1: 8146132: Excessive output from make test-image
  • dcf1523: 8300077: Refactor code examples to use @snippet in java.text.ChoiceFormat

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 19, 2023
calvinccheung
calvinccheung approved these changes Jan 23, 2023
View reviewed changes
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.

LGTM

@iklam
Copy link
Member Author

iklam commented Jan 24, 2023

Thanks @dholmes-ora and @calvinccheung for the review.
/integrate

@openjdk
Copy link

openjdk bot commented Jan 24, 2023

Going to push as commit afd5921.
Since your change was applied there have been 10 commits pushed to the master branch:

  • 937ba1c: 8300111: Add rpath for common lib locations for jpackageapplauncher
  • 2da2e5a: 8300946: Add sun/security/provider/certpath/OCSP/OCSPNoContentLength to ProblemList
  • 0323609: 8300706: Use @snippet in java.text
  • b5ee3d1: 8299497: Usage of constructors of primitive wrapper classes should be avoided in java.desktop API docs
  • 77a5010: 8286775: Remove identical per-compiler definitions of unsigned integral jtypes
  • f79e587: 8300828: Avoid unnecessary array fill after creation in com.sun.media.sound
  • 56dc3b0: Merge
  • fd75217: 8290919: Update nroff pages in JDK 20 before RC
  • 0ea2dd1: 8146132: Excessive output from make test-image
  • dcf1523: 8300077: Refactor code examples to use @snippet in java.text.ChoiceFormat

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 24, 2023
@openjdk openjdk bot closed this Jan 24, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 24, 2023
@openjdk
Copy link

openjdk bot commented Jan 24, 2023

@iklam Pushed as commit afd5921.

💡 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
Reviewers

@calvinccheung calvinccheung calvinccheung approved these changes

@dholmes-ora dholmes-ora dholmes-ora approved these changes

Assignees
No one assigned
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iklam @calvinccheung @dholmes-ora