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

8273914: Indy string concat changes order of operations #2933

Closed
wants to merge 5 commits into from

Conversation

cushon
Copy link
Contributor

@cushon cushon commented Sep 10, 2024

This is a backport of JDK-8273914: Indy string concat changes order of operations.

The patch applied cleanly. I downgrade the class file major version in the .jasm test inputs for compatibility with JDK 11.

Testing: tier1 langtools tests


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Change requires CSR request JDK-8339881 to be approved
  • Commit message must refer to an issue
  • JDK-8273914 needs maintainer approval

Issues

  • JDK-8273914: Indy string concat changes order of operations (Bug - P4 - Approved)
  • JDK-8339881: Indy string concat changes order of operations (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2933

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 10, 2024

👋 Welcome back cushon! 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 Sep 10, 2024

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

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

8273914: Indy string concat changes order of operations

Reviewed-by: andrew

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport cfee4512f7048e9cf440078e9eb87d37c7ebcdd9 8273914: Indy string concat changes order of operations Sep 10, 2024
@openjdk
Copy link

openjdk bot commented Sep 10, 2024

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

@openjdk
Copy link

openjdk bot commented Sep 10, 2024

At least one of the issues associated with this backport has a resolved CSR for a different version. As this means that this backport may also need a CSR, the csr label is being added to this pull request to signal this potential requirement. The command /csr unneeded can be used to remove the label in case a CSR is not needed.

@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label Sep 10, 2024
@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Sep 20, 2024
@cushon cushon marked this pull request as ready for review September 21, 2024 20:07
@openjdk
Copy link

openjdk bot commented Sep 21, 2024

⚠️ @cushon This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 21, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 21, 2024

Webrevs

@cushon
Copy link
Contributor Author

cushon commented Sep 21, 2024

/approval request Backporting this change fixes a bug with invokedynamic-based string concatenation. The fix has received real-world testing since 2022, including in JDK 21. The backport applies cleanly. Langtools tier1 tests pass.

@openjdk
Copy link

openjdk bot commented Sep 21, 2024

@cushon
8273914: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Sep 21, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 19, 2024

@cushon This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk openjdk bot removed the clean label Oct 20, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 30, 2024

@cushon This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@cushon
Copy link
Contributor Author

cushon commented Oct 30, 2024

Let's keep this open for now

@openjdk openjdk bot removed the approval label Nov 8, 2024
@cushon
Copy link
Contributor Author

cushon commented Nov 19, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Nov 19, 2024

@cushon This pull request has not yet been marked as ready for integration.

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 17, 2024

@cushon This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@cushon
Copy link
Contributor Author

cushon commented Dec 17, 2024

Let's keep this open

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Backport looks good (near clean) and issue is fixed:

$ cat T.java
class T {
  static String test() {
    StringBuilder builder = new StringBuilder("foo");
    return "" + builder + builder.append("bar");
  }

  public static void main(String[] args) {
    System.err.println(test());
  }
} 

$ $HOME/build/openjdk11/bin/javac -version
javac 11.0.18-internal
$ $HOME/build/openjdk11/bin/javac T.java
$ $HOME/build/openjdk11/bin/java T
foobarfoobar

$ $HOME/builder/11u-dev/images/jdk/bin/javac -version
javac 11.0.26-internal
$ $HOME/builder/11u-dev/images/jdk/bin/javac T.java
$ $HOME/build/openjdk11/bin/java T
foofoobar

jtreg tests in test/langtools/tools/javac/StringConcat and test/hotspot/jtreg/runtime/modules/AccessCheck pass

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 11, 2025
@cushon
Copy link
Contributor Author

cushon commented Jan 11, 2025

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 11, 2025
@openjdk
Copy link

openjdk bot commented Jan 11, 2025

@cushon
Your change (at version 78b330e) is now ready to be sponsored by a Committer.

@gnu-andrew
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 11, 2025

Going to push as commit be6956b.

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

openjdk bot commented Jan 11, 2025

@gnu-andrew @cushon Pushed as commit be6956b.

💡 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 integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants