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

8274329: Fix non-portable HotSpot code in MethodMatcher::parse_method_pattern #509

Closed
wants to merge 1 commit into from

Conversation

@DamonFool
Copy link
Member

@DamonFool DamonFool commented Oct 11, 2021

Hi all,

This is the backport of c833b4d130fabfa6a6f3a38313f76eb7e392c6a5.
I'd like to backport it to fix the build failure on Windows for non-English speaking countries.

Patch doesn't apply cleanly (only the removal of pragma warning should be manually adjusted).

Thanks.
Best regards,
Jie


Progress

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

Issue

  • JDK-8274329: Fix non-portable HotSpot code in MethodMatcher::parse_method_pattern

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 509

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 11, 2021

👋 Welcome back jiefu! 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 c833b4d130fabfa6a6f3a38313f76eb7e392c6a5 8274329: Fix non-portable HotSpot code in MethodMatcher::parse_method_pattern Oct 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 11, 2021

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

@openjdk openjdk bot added the backport label Oct 11, 2021
@DamonFool DamonFool marked this pull request as ready for review Oct 11, 2021
@openjdk openjdk bot added the rfr label Oct 11, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 11, 2021

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Good.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 11, 2021

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

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

8274329: Fix non-portable HotSpot code in MethodMatcher::parse_method_pattern

Reviewed-by: kvn

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 2 new commits pushed to the master branch:

  • 9512c47: 8273826: Correct Manifest file name and NPE checks
  • bcee700: 8273961: jdk/nio/zipfs/ZipFSTester.java fails if file path contains '+' character

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.

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 (@vnkozlov) 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 added the ready label Oct 11, 2021
@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 11, 2021

Good.

Thanks @vnkozlov .

Let's wait for the approval of jdk11u maintainer before pushing it.
Thanks.

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 12, 2021

Fix request had been approved.
So integrate it.
And I need a sponsor.
Thanks.

/integrate

@openjdk openjdk bot added the sponsor label Oct 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

@DamonFool
Your change (at version 31cbc21) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 12, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

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

  • aa5d5f3: 8245147: Refactor and improve utility of test/langtools/tools/javac/versions/Versions.java
  • 9512c47: 8273826: Correct Manifest file name and NPE checks
  • bcee700: 8273961: jdk/nio/zipfs/ZipFSTester.java fails if file path contains '+' character

Your commit was automatically rebased without conflicts.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

@RealCLanger @DamonFool Pushed as commit fc2646b.

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

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 12, 2021

Thanks @RealCLanger for sponsoring.

@DamonFool DamonFool deleted the Backport-JDK-8274329 branch Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants