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-8301513: Replace NULL with nullptr in os_cpu/windows_x86 #12341

Closed
wants to merge 1 commit into from

Conversation

jdksjolen
Copy link
Contributor

@jdksjolen jdksjolen commented Jan 31, 2023

Hi, this PR changes all occurrences of NULL to nullptr for the subdirectory os_cpu/windows_x86. Unfortunately the script that does the change isn't perfect, and so we
need to comb through these manually to make sure nothing has gone wrong. I also review these changes but things slip past my eyes sometimes.

Here are some typical things to look out for:

  1. No changes but copyright header changed (probably because I reverted some changes but forgot the copyright).
  2. Macros having their NULL changed to nullptr, these are added to the script when I find them. They should be NULL.
  3. nullptr in comments and logs. We try to use lower case "null" in these cases as it reads better. An exception is made when code expressions are in a comment.

An example of this:

// This function returns null
void* ret_null();
// This function returns true if *x == nullptr
bool is_nullptr(void** x);

Note how nullptr participates in a code expression here, we really are talking about the specific value nullptr.

Thanks!


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8301513: Replace NULL with nullptr in os_cpu/windows_x86

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12341/head:pull/12341
$ git checkout pull/12341

Update a local copy of the PR:
$ git checkout pull/12341
$ git pull https://git.openjdk.org/jdk pull/12341/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12341

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12341.diff

@jdksjolen jdksjolen marked this pull request as ready for review January 31, 2023 11:44
@jdksjolen
Copy link
Contributor Author

Looks OK and trivial to me.

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 31, 2023

👋 Welcome back jsjolen! 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 added the rfr Pull request is ready for review label Jan 31, 2023
@openjdk
Copy link

openjdk bot commented Jan 31, 2023

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

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Jan 31, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 31, 2023

Webrevs

Copy link

@kimbarrett kimbarrett 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, and trivial.

@openjdk
Copy link

openjdk bot commented Jan 31, 2023

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

8301513: Replace NULL with nullptr in os_cpu/windows_x86

Reviewed-by: kbarrett

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

  • b76a52f: 8301076: Replace NULL with nullptr in share/prims/
  • 90ec19e: 8301068: Replace NULL with nullptr in share/jvmci/
  • 419409b: 8301337: Remove unused os::_polling_page
  • d583767: 8301338: Identical branch conditions in CompileBroker::print_heapinfo
  • 810c8a2: 8301170: perfMemory_windows.cpp add free_security_attr to early returns
  • 33e653e: 8301448: [BACKOUT] CodeHeap has virtual methods that are not overridden
  • cdb4ba9: 8301326: Optimize compiler/uncommontrap/TestDeoptOOM.java test
  • 9cc0171: 8301153: RISC-V: pipeline class for several instructions is not set correctly
  • 633e291: 8301067: RISC-V: better error message when reporting unsupported satp modes
  • 4b0e259: 8301344: G1: Remove DirtyCardToOopClosure forward declaration in g1OopClosures.hpp
  • ... and 54 more: https://git.openjdk.org/jdk/compare/107e184d59c0bbed6441a3c1a9bfd4527da3bce5...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 Jan 31, 2023
@jdksjolen
Copy link
Contributor Author

Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Feb 2, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 2, 2023

@jdksjolen Pushed as commit c109dae.

💡 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
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
2 participants