Skip to content

Conversation

@jaikiran
Copy link
Member

@jaikiran jaikiran commented Feb 3, 2025

Can I please get a review of this backport of #23420 into jdk24?

This proposes to bring in those same backouts into jdk24 to prevent the issue noted in that PR description. jdk24 is in rampdown and this backport will require an approval. A approval request has been raised in https://bugs.openjdk.org/browse/JDK-8349183?focusedId=14746841&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-14746841.

This backport into jdk24 wasn't clean due to a trivial merge conflict in StringLatin1.java file. That merge conflict was manually resolved (just like it was done against mainline). The git commands used to create this backport against jdk24 branch are:

<checkout fresh jdk24 branch>
git cherry-pick --no-commit 618c5eb27b4c719afd577b690e6bcb21a45fcb0d
<resolve merge conflict in StringLatin1.java>
git commit -m 'Backport 618c5eb27b4c719afd577b690e6bcb21a45fcb0d'

tier1, tier2 and tier3 testing is currently in progress with this change.


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

Issues

  • JDK-8349183: [BACKOUT] Optimization for StringBuilder append boolean & null (Sub-task - P2)
  • JDK-8349239: [BACKOUT] Reuse StringLatin1::putCharsAt and StringUTF16::putCharsAt (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23425

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 3, 2025

👋 Welcome back jpai! A progress list of the required criteria for merging this PR into jdk24 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 Feb 3, 2025

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

8349183: [BACKOUT] Optimization for StringBuilder append boolean & null
8349239: [BACKOUT] Reuse StringLatin1::putCharsAt and StringUTF16::putCharsAt

Reviewed-by: rriggs, liach

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 1 new commit pushed to the jdk24 branch:

  • b1659e3: 8348562: ZGC: segmentation fault due to missing node type check in barrier elision analysis

Please see this link for an up-to-date comparison between the source branch of this pull request and the jdk24 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 jdk24 branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title Backport 618c5eb27b4c719afd577b690e6bcb21a45fcb0d 8349183: [BACKOUT] Optimization for StringBuilder append boolean & null Feb 3, 2025
@openjdk
Copy link

openjdk bot commented Feb 3, 2025

This backport pull request has now been updated with issues from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Feb 3, 2025
@openjdk
Copy link

openjdk bot commented Feb 3, 2025

@jaikiran The following labels will be automatically applied to this pull request:

  • core-libs
  • hotspot-compiler

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 pull request command.

@mlbridge
Copy link

mlbridge bot commented Feb 3, 2025

Webrevs

@vnkozlov
Copy link
Contributor

vnkozlov commented Feb 3, 2025

@jaikiran You need to get approval for JDK 24 backport.

@jaikiran
Copy link
Member Author

jaikiran commented Feb 3, 2025

@jaikiran You need to get approval for JDK 24 backport.

Agreed. A approval request has already been raised https://bugs.openjdk.org/browse/JDK-8349183?focusedId=14746841&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-14746841.

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

Looks good, thanks. A second reviewer might be useful.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 4, 2025
@jaikiran
Copy link
Member Author

jaikiran commented Feb 5, 2025

Thank you Roger and Chen for the reviews.

Approval for backporting the 2 issues, linked to this PR, into jdk24 has now been granted. I've run tier1 through tier6 with these changes in our CI and that has completed without related issues. tier7 and tier8 are progressing fine too.

I'll go ahead and integrate this shortly.

@jaikiran
Copy link
Member Author

jaikiran commented Feb 5, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Feb 5, 2025

Going to push as commit f0837b2.
Since your change was applied there has been 1 commit pushed to the jdk24 branch:

  • b1659e3: 8348562: ZGC: segmentation fault due to missing node type check in barrier elision analysis

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 5, 2025

@jaikiran Pushed as commit f0837b2.

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

@jaikiran jaikiran deleted the backport-jaikiran-618c5eb2-jdk24 branch February 5, 2025 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base core-libs [email protected] hotspot-compiler [email protected] integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants