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

8268118: Rename bytes_os_cpu.inline.hpp files to bytes_os_cpu.hpp #4310

Conversation

@stefank
Copy link
Member

@stefank stefank commented Jun 2, 2021

Today we transitively include the bytes_<os>_<cpu>.inline.hpp files from bytes.hpp. This is goes against the HotSpot Style Guide that states:

.inline.hpp files should only be included in .cpp or .inline.hpp files.

The bytes_<os>_<cpu>.inline.hpp don't include any other HotSpot files, so I propose that we simply rename them to bytes_<os>_<cpu>.hpp.


Progress

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

Issue

  • JDK-8268118: Rename bytes_os_cpu.inline.hpp files to bytes_os_cpu.hpp

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4310

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

Using diff file

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

@stefank
Copy link
Member Author

@stefank stefank commented Jun 2, 2021

/label add hotspot

Loading

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 2, 2021

👋 Welcome back stefank! 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.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jun 2, 2021

@stefank
The hotspot label was successfully added.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 2, 2021

Webrevs

Loading

coleenp
coleenp approved these changes Jun 2, 2021
Copy link
Contributor

@coleenp coleenp left a comment

Seems fine and trivial if you've compiled it on all these platforms (we have cross compilations for ppc and s390).
I guess we picked .inline.hpp for the file names since the define inline functions but it's better to avoid breaking the .inline.hpp rule.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jun 2, 2021

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

8268118: Rename bytes_os_cpu.inline.hpp files to bytes_os_cpu.hpp

Reviewed-by: coleenp, dholmes

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 15 new commits pushed to 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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

Loading

@openjdk openjdk bot added the ready label Jun 2, 2021
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Seems okay. As the inline definitions are trivial they don't need to be in an inline.hpp file.

Thanks,
David

Loading

@stefank
Copy link
Member Author

@stefank stefank commented Jun 3, 2021

Thanks for reviewing!

I pulled in #4303 locally and cross-compiled to verify that this didn't break the build.
/integrate

Loading

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

@openjdk openjdk bot commented Jun 3, 2021

@stefank Since your change was applied there have been 21 commits pushed to the master branch:

  • 1296a6c: 8268119: Rename copy_os_cpu.inline.hpp files to copy_os_cpu.hpp
  • 1783437: 8264975: java/net/DatagramSocket/DatagramSocketMulticasting.java fails infrequently
  • a52a08d: 8267916: Adopt cast notation for CompilerThread conversions
  • 9bf347b: 8226362: langtools ProblemList file contains more than 1 entry for a test
  • bdeaeb4: 8240256: Better resource cleaning for SunPKCS11 Provider
  • 06f87cf: 8266337: ThreadTimesClosure doesn't handle exceptions properly
  • ef01e47: 8268150: tier2: test/jdk/tools/jpackage/junit/junit.java needs updating for jtreg 6
  • e9f3e32: 8259530: Generated docs contain MIT/GPL-licenced works without reproducing the licence
  • d46a2c8: 8268147: need to update reference to testng module for jtreg6
  • 76fdf2c: 8268146: fix for JDK-8266254 fails validate-source
  • ... and 11 more: https://git.openjdk.java.net/jdk/compare/476775808f82a4b0d42ac58fdb801812b54e01a1...master

Your commit was automatically rebased without conflicts.

Pushed as commit c8f4c02.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants