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

8272306: [lworld] Fix incorrectly merged code in classListParser.cpp #538

Closed

Conversation

iklam
Copy link
Member

@iklam iklam commented Aug 23, 2021

Please review this simple fix (and small clean up) for incorrectly merged code in classListParser.cpp.

This following shows the difference between valhalla and the JDK mainline after this PR:

$ wget https://raw.githubusercontent.com/iklam/valhalla/4da52eaf53e531e96e1e6eac460d6209916d6f2f/src/hotspot/share/cds/classListParser.cpp
$ wget https://raw.githubusercontent.com/iklam/valhalla/a977e73076022958f9da874d029b1bfdba92f7af/src/hotspot/share/cds/classListParser.cpp
$ diff classListParser.cpp classListParser.cpp.1 

Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8272306: [lworld] Fix incorrectly merged code in classListParser.cpp

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/valhalla pull/538/head:pull/538
$ git checkout pull/538

Update a local copy of the PR:
$ git checkout pull/538
$ git pull https://git.openjdk.java.net/valhalla pull/538/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 538

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/valhalla/pull/538.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 23, 2021

👋 Welcome back iklam! A progress list of the required criteria for merging this PR into lworld 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 Aug 23, 2021

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

8272306: [lworld] Fix incorrectly merged code in classListParser.cpp

Reviewed-by: dsimms

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 lworld 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 lworld branch, type /integrate in a new comment.

@mlbridge
Copy link

mlbridge bot commented Aug 23, 2021

Webrevs

Copy link
Member

@MrSimms MrSimms left a comment

Thanks Ioi, this would be my mess you cleaned up here, much appreciated. Changes look good

@iklam
Copy link
Member Author

iklam commented Aug 23, 2021

@MrSimms thanks for the review.
/integrate

@openjdk
Copy link

openjdk bot commented Aug 23, 2021

Going to push as commit dd0a9eb.

@openjdk openjdk bot closed this Aug 23, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 23, 2021
@openjdk
Copy link

openjdk bot commented Aug 23, 2021

@iklam Pushed as commit dd0a9eb.

💡 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
3 participants