Skip to content

8324686: Remove redefinition of NULL for MSVC #24537

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

Closed
wants to merge 1 commit into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Apr 9, 2025

Please review this change that removes the redefinition of NULL in
globalDefinitions_visCPP.hpp. That redefinition was to support the use of NULL
in a varargs context, because of the size difference for int vs a pointer.
However, we no longer have any direct uses of NULL in HotSpot, and have a test
that ensures there is no backsliding.

There may be indirect uses of NULL via third-party libraries. Such uses could
have been in the scope of the removed redefinition. But those uses must have
been correct even without the redefinition, else they would be incorrect for
non-HotSpot users.

Testing: mach5 tier1-3, GHA sanity tests


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-8324686: Remove redefinition of NULL for MSVC (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24537

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 9, 2025

👋 Welcome back kbarrett! 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 Apr 9, 2025

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

8324686: Remove redefinition of NULL for MSVC

Reviewed-by: shade, 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 30 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 9, 2025
@openjdk
Copy link

openjdk bot commented Apr 9, 2025

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

  • hotspot

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.

@mlbridge
Copy link

mlbridge bot commented Apr 9, 2025

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine. So, just to be extra clear, this would only affect Hotspot, not JDK. There are no interesting hits for NULL-s right now in Hotspot code. There are still lots of NULL-s in JDK native code.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 9, 2025
@kimbarrett
Copy link
Author

Looks fine. So, just to be extra clear, this would only affect Hotspot, not JDK. There are no interesting hits for NULL-s right now in Hotspot code. There are still lots of NULL-s in JDK native code.

That's correct. And there's a test to keep it that way:
https://github.com/openjdk/jdk/blob/master/test/hotspot/jtreg/sources/TestNoNULL.java

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Looks fine. Thanks for cleaning this up.

@kimbarrett
Copy link
Author

Thanks for reviews @shipilev and @dholmes-ora .

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 10, 2025

Going to push as commit 6c26670.
Since your change was applied there have been 39 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 Apr 10, 2025
@openjdk openjdk bot closed this Apr 10, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 10, 2025
@openjdk
Copy link

openjdk bot commented Apr 10, 2025

@kimbarrett Pushed as commit 6c26670.

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

@kimbarrett kimbarrett deleted the vs-null branch April 10, 2025 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants