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

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

Closed

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Feb 9, 2022

After some prior offlist discussions with Oracle staff, I propose to change the names of some of the adlc classes and functions to avoid name clashes with their hotspot counterparts. This has bugged me for a while since my IDE gets often confused about this when working on hotspot arena code.

This patch prefixes "Arena", "Chunk", "CHeapObj" and "AllStatic", "AllocateHeap", "ReallocateHeap" with "Adl...". The replacement is purely mechanical, no functional change happens here.

Thanks, Thomas


Progress

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

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/jdk pull/7400/head:pull/7400
$ git checkout pull/7400

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7400

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 9, 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
Copy link

openjdk bot commented Feb 9, 2022

@tstuefe The following label will be automatically applied to this pull request:

  • hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Feb 9, 2022
@tstuefe tstuefe marked this pull request as ready for review February 9, 2022 11:09
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 9, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 9, 2022

Webrevs

Copy link

@neliasso neliasso left a comment

Choose a reason for hiding this comment

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

Looks good!

@openjdk
Copy link

openjdk bot commented Feb 10, 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: neliasso, 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 17 new commits pushed to the master branch:

  • 039313d: 8054449: Incompatible type in example code in TreePath
  • 3ce1c5b: 8280832: Update usage docs for NonblockingQueue
  • d442328: 8281262: Windows builds in different directories are not fully reproducible
  • c820d1a: 8281379: Assign package declarations to all jtreg test cases under gc
  • fa0a72c: 8252496: C2: Useless code in MergeMemNode::Ideal
  • 7218d84: 8281567: Remove @throws IOException from X509CRLImpl::getExtension docs
  • fd8a3dc: 8280820: Clean up bug8033699 and bug8075609.java tests: regtesthelpers aren't used
  • 178b962: 8265765: DomainKeyStore may stop enumerating aliases if a constituting KeyStore is empty
  • c5c8c06: 8279822: CI: Constant pool entries in error state are not supported
  • f823bed: 8280007: Enable Neoverse N1 optimizations for Arm Neoverse V1 & N2
  • ... and 7 more: https://git.openjdk.java.net/jdk/compare/fc77217814eb1a346d7380299abdc2b01a69b4de...master

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.

➡️ 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 Feb 10, 2022
Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good

@tstuefe
Copy link
Member Author

tstuefe commented Feb 11, 2022

Thanks @neliasso and @vnkozlov

/integrate

@openjdk
Copy link

openjdk bot commented Feb 11, 2022

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

  • 84868e3: 8281275: Upgrading from 8 to 11 no longer accepts '/' as filepath separator in gc paths
  • 58c2bd3: 8281536: JFR: Improve jdk.jfr.ContentType documentation
  • 83b6e4b: 8281294: [vectorapi] FIRST_NONZERO reduction operation throws IllegalArgumentExcept on zero vectors
  • 039313d: 8054449: Incompatible type in example code in TreePath
  • 3ce1c5b: 8280832: Update usage docs for NonblockingQueue
  • d442328: 8281262: Windows builds in different directories are not fully reproducible
  • c820d1a: 8281379: Assign package declarations to all jtreg test cases under gc
  • fa0a72c: 8252496: C2: Useless code in MergeMemNode::Ideal
  • 7218d84: 8281567: Remove @throws IOException from X509CRLImpl::getExtension docs
  • fd8a3dc: 8280820: Clean up bug8033699 and bug8075609.java tests: regtesthelpers aren't used
  • ... and 10 more: https://git.openjdk.java.net/jdk/compare/fc77217814eb1a346d7380299abdc2b01a69b4de...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 11, 2022

@tstuefe Pushed as commit eee6a56.

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

@tstuefe tstuefe deleted the JDK-8281522-rename-adlc-classes branch February 15, 2023 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants