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

8281522: Rename ADLC classes which have the same name as hotspot variants #332

Closed
wants to merge 2 commits into from

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Apr 1, 2022

I'd like to bring this into JDK17. Its a purely mechanical renaming of classes in ADLC. It does not apply cleanly, but the only conflicts were copyright headers (ADLC gets touched very rarely).

The reason I want this downported is to make future code changes easier and to simplify development. I was on the fence about this one, but since its really low risk, I think it makes sense to downport this.


Progress

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

Issue

  • JDK-8281522: Rename ADLC classes which have the same name as hotspot variants

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 332

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 1, 2022

👋 Welcome back stuefe! 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 eee6a5622dca683d4d6a701daa48e09e8d17b54e 8281522: Rename ADLC classes which have the same name as hotspot variants Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 2022

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

@openjdk openjdk bot added the backport label Apr 1, 2022
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

I think this makes sense. It's always good to be able to distinguish the ADLC stuff from the rest.

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

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

8281522: Rename ADLC classes which have the same name as hotspot variants

Reviewed-by: mdoerr

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 the ready Pull request is ready to be integrated label Apr 1, 2022
@tstuefe
Copy link
Member Author

tstuefe commented Apr 1, 2022

I think this makes sense. It's always good to be able to distinguish the ADLC stuff from the rest.

Thanks Martin!

@tstuefe
Copy link
Member Author

tstuefe commented Apr 1, 2022

/clean

@openjdk openjdk bot added the clean label Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@tstuefe This backport pull request is now marked as clean

@TheRealMDoerr
Copy link
Contributor

Note that this PR is still draft!

@tstuefe tstuefe marked this pull request as ready for review April 4, 2022 16:33
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 4, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 4, 2022

Webrevs

@tstuefe
Copy link
Member Author

tstuefe commented Apr 5, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Apr 5, 2022

Going to push as commit 83dba03.
Since your change was applied there has been 1 commit pushed to the master branch:

  • ba4e609: 8282382: Report glibc malloc tunables in error reports

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 5, 2022

@tstuefe Pushed as commit 83dba03.

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

@tstuefe tstuefe deleted the tstuefe-backport-eee6a562 branch January 30, 2023 09:06
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
2 participants