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

8279833: Loop optimization issue in String.encodeUTF8_UTF16 #791

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 24, 2022

I backport this for parity with 11.0.15-oracle.

The patch does not apply well.

8259842: Remove Result cache from StringCoding is missing in 11.
Therefore the actual change must be applied to StringCoding.java
and not to String.java. The method encodeUTF8_UTF16() was moved
from the one to the other file in 8259842.

8259842 change also brought the benchmark edited by this change.
I include the whole benchmark in this change. I had to adapt the strings
to compile with 11.


Progress

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

Issue

  • JDK-8279833: Loop optimization issue in String.encodeUTF8_UTF16

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/791/head:pull/791
$ git checkout pull/791

Update a local copy of the PR:
$ git checkout pull/791
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/791/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 791

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/791.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 24, 2022

👋 Welcome back goetz! 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 openjdk bot changed the title Backport ff8565931115d581afff679ea85b1a2d80c03b99 8279833: Loop optimization issue in String.encodeUTF8_UTF16 Jan 24, 2022
@openjdk
Copy link

openjdk bot commented Jan 24, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jan 24, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 24, 2022

Webrevs

@tstuefe
Copy link
Member

tstuefe commented Jan 25, 2022

8259842 change also brought the benchmark edited by this change.
I include the whole benchmark in this change. I had to adapt the strings
to compile with 11.

Could you point out the changed strings please?

Hmm, the test is identical to master. I assume that is what you wanted.

Copy link
Member

@tstuefe tstuefe 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, 2022

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8279833: Loop optimization issue in String.encodeUTF8_UTF16

Reviewed-by: stuefe

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 master branch:

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 25, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jan 26, 2022

8259842 change also brought the benchmark edited by this change.
I include the whole benchmark in this change. I had to adapt the strings
to compile with 11.

Could you point out the changed strings please?

Hmm, the test is identical to master. I assume that is what you wanted.

The original uses text blocks ("""), I am using normal Strings and '+' to concatenate. The intend is to have the identical String as in master in the end.

@GoeLin
Copy link
Member Author

GoeLin commented Jan 26, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jan 26, 2022

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

  • 8352e38: 8273277: C2: Move conditional negation into rc_predicate
  • 9700ded: 8253197: vmTestbase/nsk/jvmti/StopThread/stopthrd007/TestDescription.java fails with "ERROR: DebuggeeSleepingThread: ThreadDeath lost"
  • e279d07: 8236210: javac generates wrong annotation for fields generated from record components
  • e651f09: 8236505: Mark jdk/editpad/EditPadTest.java as @headful

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 26, 2022

@GoeLin Pushed as commit 84ed967.

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

@GoeLin GoeLin deleted the goetz_backport_8279833 branch February 10, 2022 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants