Skip to content

8298612: Refactor archiving of java String objects#12173

Closed
iklam wants to merge 7 commits intoopenjdk:masterfrom
iklam:8298612-refactor-archiving-of-java-string-objects
Closed

8298612: Refactor archiving of java String objects#12173
iklam wants to merge 7 commits intoopenjdk:masterfrom
iklam:8298612-refactor-archiving-of-java-string-objects

Conversation

@iklam
Copy link
Member

@iklam iklam commented Jan 24, 2023

This is the last prerequisite PR for JDK-8296344 (Remove dependency on G1 for writing the CDS archive heap).

The old StringTable::write_to_archive() violates requirements [1] and [2] as stated in JDK-8298600.

In the new implementation, copying of strings into the archive has been moved inside of heapShared.cpp. Now we no longer expose the HeapShared::archive_object() API. This addresses requirement [1].

Also, we no longer hand-assemble the String object and its internal value array. Instead, we use HeapShared::archive_reachable_objects_from to recursively copy the value. This addresses requirement [2].

Test: tiers 1-4.


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-8298612: Refactor archiving of java String objects

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12173

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

Using diff file

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

@iklam iklam changed the title 8298612 refactor archiving of java string objects 8298612: Refactor archiving of java String objects Jan 24, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 24, 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 24, 2023

@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 Jan 24, 2023
@iklam iklam marked this pull request as ready for review January 24, 2023 21:59
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 24, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 24, 2023

Webrevs

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

@openjdk
Copy link

openjdk bot commented Jan 25, 2023

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

8298612: Refactor archiving of java String objects

Reviewed-by: 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 25, 2023
@iklam
Copy link
Member Author

iklam commented Jan 29, 2023

Thanks @calvinccheung for the review.
Passed tiers 1-4
/integrate

@openjdk
Copy link

openjdk bot commented Jan 29, 2023

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

  • d4e9f5e: 8238170: BeanContextSupport remove and propertyChange can deadlock
  • 6475501: 8300208: Optimize Adler32 stub for AVX-512 targets.

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 29, 2023

@iklam Pushed as commit 1ff4646.

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

Development

Successfully merging this pull request may close these issues.

2 participants