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

8035787: SourcePositions are wrong for Strings concatenated with '+' operator #1742

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Feb 15, 2023

I backport this for parity with 11.0.19-oracle.


Progress

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

Issue

  • JDK-8035787: SourcePositions are wrong for Strings concatenated with '+' operator

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1742/head:pull/1742
$ git checkout pull/1742

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1742

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1742.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 15, 2023

👋 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 25642dd30317e77bc15d36d5fa512da5fb54dad9 8035787: SourcePositions are wrong for Strings concatenated with '+' operator Feb 15, 2023
@openjdk
Copy link

openjdk bot commented Feb 15, 2023

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

@openjdk
Copy link

openjdk bot commented Feb 15, 2023

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

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

8035787: SourcePositions are wrong for Strings concatenated with '+' operator

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 15, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 15, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Feb 16, 2023

re-submit failure: windows infra issue.
This is a testbug that does not depend on win so I think we can go without these tests.

@GoeLin
Copy link
Member Author

GoeLin commented Feb 16, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Feb 16, 2023

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

  • 1d32290: 8233462: serviceability/tmtools/jstat tests times out with -Xcomp
  • 5c1748a: 8171405: java/net/URLConnection/ResendPostBody.java failed with "Error while cleaning up threads after test"
  • 22be061: 8226917: jvmti/scenarios/contention/TC04/tc04t001/TestDescription.java fails on jvmti->InterruptThread (JVMTI_ERROR_THREAD_NOT_ALIVE)
  • a3d867b: 8226595: jvmti/scenarios/contention/TC04/tc04t001/TestDescription.java still fails due to wrong number of MonitorContendedEntered events
  • 3a2a0f9: 8223463: Replace wildcard address with loopback or local host in tests - part 2
  • 5685e58: 8207248: Reduce incidence of compiler.warn.source.no.bootclasspath in javac tests
  • 0a91274: 8282958: Rendering Issues with Borders on Windows High-DPI systems
  • 6678084: 8279614: The left line of the TitledBorder is not painted on 150 scale factor
  • b096b9d: 8289562: Change bugs.java.com and bugreport.java.com URL's to https

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 16, 2023

@GoeLin Pushed as commit 131084c.

💡 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
backport clean integrated Pull request has been integrated
1 participant