8300081: Replace NULL with nullptr in share/asm/ #14010

jdksjolen · 2023-05-16T12:10:34Z

Hi, this PR changes all occurrences of NULL to nullptr for the subdirectory share/asm. 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:

No changes but copyright header changed (probably because I reverted some changes but forgot the copyright).
Macros having their NULL changed to nullptr, these are added to the script when I find them. They should be NULL.
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-8300081: Replace NULL with nullptr in share/asm/

Reviewers

Coleen Phillimore (@coleenp - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14010

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-05-16T12:12:08Z

👋 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.

jdksjolen

Only 3 comment issues

jdksjolen · 2023-05-16T12:12:10Z

src/hotspot/share/asm/codeBuffer.cpp

    buf = (address)dest->relocation_begin();
    buf_limit = (address)dest->relocation_end() - buf;
  }
-  // if dest == NULL, this is just the sizing pass
+  // if dest == null, this is just the sizing pass


jdksjolen · 2023-05-16T12:12:29Z

src/hotspot/share/asm/codeBuffer.cpp

@@ -877,7 +877,7 @@ void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {

  // Resizing must be allowed
  {
-    if (blob() == NULL)  return;  // caller must check for blob == NULL
+    if (blob() == nullptr)  return;  // caller must check for blob == null


"check whether blob is null"

jdksjolen · 2023-05-16T12:12:40Z

src/hotspot/share/asm/codeBuffer.cpp

  // Make sure the old cb won't try to use it or free it.
  DEBUG_ONLY(cb->_blob = (BufferBlob*)badAddress);
 }

 void CodeBuffer::verify_section_allocation() {
  address tstart = _total_start;
-  if (tstart == badAddress)  return;  // smashed by set_blob(NULL)
+  if (tstart == badAddress)  return;  // smashed by set_blob(null)


openjdk · 2023-05-16T12:14:11Z

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

mlbridge · 2023-05-16T13:30:37Z

Webrevs

00: Full (2a53ddb6)

coleenp

Looks good, also trivial.

openjdk · 2023-05-16T14:30:57Z

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

8300081: Replace NULL with nullptr in share/asm/

Reviewed-by: coleenp

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

23cbb2d: 8306860: Avoid unnecessary allocation in List.map() when list is empty
be54b54: 8307369: Add execution of all svc tests in CI
19c8c30: 8305634: Renaming predicates, simple cleanups, and adding summary about current predicates
72294c5: 8308024: HttpClient (HTTP/1.1) sends an extraneous empty chunk if the BodyPublisher supplies an empty buffer
c9b6bb5: 8308041: [JVMCI] WB_IsGCSupportedByJVMCICompiler must enter correct JVMCI env
0790f70: 8306806: JMX agent with JDP enabled won't start when PerfData is disabled
c2ef302: 8307968: serviceability/jvmti/vthread/StopThreadTest/StopThreadTest.java timed out
d22bcc8: 8307403: java/util/zip/DeInflate.java timed out
2210e06: 8306638: Open source some AWT tests related to datatransfer and Toolkit
05b51c7: 8307567: Avoid relocating global roots to metaspaceObjs in CDS dump
... and 212 more: https://git.openjdk.org/jdk/compare/1532a1b0bd72f37b77540af51368271ef80e17d2...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.

jdksjolen · 2023-05-16T15:39:27Z

Thanks Coleen,

This passes tier1 so merging now.

/integrate

openjdk · 2023-05-16T15:40:45Z

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

41ee125: 8278411: Implement UseHeavyMonitors consistently, s390 port
316bc79: 8308188: ProblemList java/util/concurrent/locks/Lock/OOMEInAQS.java with ZGC on all platforms
8686a36: 8307315: Missing ResourceMark in CDS and JVMTI code
23cbb2d: 8306860: Avoid unnecessary allocation in List.map() when list is empty
be54b54: 8307369: Add execution of all svc tests in CI
19c8c30: 8305634: Renaming predicates, simple cleanups, and adding summary about current predicates
72294c5: 8308024: HttpClient (HTTP/1.1) sends an extraneous empty chunk if the BodyPublisher supplies an empty buffer
c9b6bb5: 8308041: [JVMCI] WB_IsGCSupportedByJVMCICompiler must enter correct JVMCI env
0790f70: 8306806: JMX agent with JDP enabled won't start when PerfData is disabled
c2ef302: 8307968: serviceability/jvmti/vthread/StopThreadTest/StopThreadTest.java timed out
... and 215 more: https://git.openjdk.org/jdk/compare/1532a1b0bd72f37b77540af51368271ef80e17d2...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-05-16T15:40:57Z

@jdksjolen Pushed as commit 9d5bab1.

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

Replace NULL with nullptr in share/asm/

6fc4c75

jdksjolen marked this pull request as draft May 16, 2023 12:10

openjdk bot changed the title ~~8300081: Replace NULL with nullptr in share/asm/~~ 8300081: Replace NULL with nullptr in share/asm/ May 16, 2023

jdksjolen commented May 16, 2023

View reviewed changes

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label May 16, 2023

Fixes

2a53ddb

jdksjolen marked this pull request as ready for review May 16, 2023 13:25

openjdk bot added the rfr Pull request is ready for review label May 16, 2023

coleenp approved these changes May 16, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 16, 2023

openjdk bot added the integrated Pull request has been integrated label May 16, 2023

openjdk bot closed this May 16, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8300081: Replace NULL with nullptr in share/asm/ #14010

8300081: Replace NULL with nullptr in share/asm/ #14010

jdksjolen commented May 16, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented May 16, 2023

jdksjolen left a comment

jdksjolen May 16, 2023

jdksjolen May 16, 2023

jdksjolen May 16, 2023

openjdk bot commented May 16, 2023

mlbridge bot commented May 16, 2023

coleenp left a comment

openjdk bot commented May 16, 2023

jdksjolen commented May 16, 2023

openjdk bot commented May 16, 2023

openjdk bot commented May 16, 2023

8300081: Replace NULL with nullptr in share/asm/ #14010

8300081: Replace NULL with nullptr in share/asm/ #14010

Conversation

jdksjolen commented May 16, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented May 16, 2023

jdksjolen left a comment

Choose a reason for hiding this comment

jdksjolen May 16, 2023

Choose a reason for hiding this comment

jdksjolen May 16, 2023

Choose a reason for hiding this comment

jdksjolen May 16, 2023

Choose a reason for hiding this comment

openjdk bot commented May 16, 2023

mlbridge bot commented May 16, 2023

Webrevs

coleenp left a comment

Choose a reason for hiding this comment

openjdk bot commented May 16, 2023

jdksjolen commented May 16, 2023

openjdk bot commented May 16, 2023

openjdk bot commented May 16, 2023

jdksjolen commented May 16, 2023 •

edited by openjdk bot

Loading