JDK-8300651: Replace NULL with nullptr in share/runtime/ #12094

jdksjolen · 2023-01-19T12:27:23Z

Do the conversion in the share/runtime/ sub-directory and all of its files.

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-8300651: Replace NULL with nullptr in share/runtime/

Reviewers

Robbin Ehn (@robehn - Reviewer) ⚠️ Review applies to 64d2c224
David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12094

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

Using diff file

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

bridgekeeper · 2023-01-19T12:29:11Z

👋 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 · 2023-01-19T12:31:37Z

@jdksjolen 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 · 2023-01-19T13:46:57Z

Webrevs

01: Full - Incremental (f71c64b7)
00: Full (64d2c224)

jdksjolen · 2023-01-19T18:08:57Z

Seems like uploading the GHA results are failing.

robehn

Thank you!

openjdk · 2023-01-20T11:35:23Z

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

8300651: Replace NULL with nullptr in share/runtime/

Reviewed-by: rehn, 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 82 new commits pushed to the master branch:

fbe5ab0: 8300830: Remove redundant assertion in src/hotspot/share/runtime/javaCalls.cpp
1339461: 8300981: Build failure on 32-bit platforms after JDK-8281213
81d523d: Merge
60b8a98: 8300591: @SuppressWarnings option "lossy-conversions" missing from jdk.compiler module javadoc
a3ed7e9: 8300623: Lambda deserialization regression involving Enum method reference
cf46004: 8300272: Improve readability of the test JarWithOneNonDisabledDigestAlg
b678e70: 8300942: JDK-8299684 breaks x86 build
3be5758: 8300769: Remove G1CollectionSet::_inc_bytes_used_before
859ca75: 8300862: Remove some G1 collection set remembered set debugging code
048705c: 8300910: Remove metaprogramming/integralConstant.hpp
... and 72 more: https://git.openjdk.org/jdk/compare/e326b86d37cec3b395b88598cf30ce4239732a15...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.

dholmes-ora

Looks good but a few cases where nullptr should be null in comments for consistency with surrounding changes if nothing else.

Thanks.

dholmes-ora · 2023-01-23T00:02:29Z

src/hotspot/share/runtime/handshake.cpp

@@ -703,7 +703,7 @@ class ThreadSelfSuspensionHandshake : public AsyncHandshakeClosure {
 };

 bool HandshakeState::suspend_with_handshake() {
-  assert(_handshakee->threadObj() != NULL, "cannot suspend with a NULL threadObj");
+  assert(_handshakee->threadObj() != nullptr, "cannot suspend with a nullptr threadObj");


Use "null" in the message please.

dholmes-ora · 2023-01-23T00:03:25Z

src/hotspot/share/runtime/java.cpp

@@ -669,13 +669,13 @@ void vm_exit_during_initialization(Handle exception) {
  // If there are exceptions on this thread it must be cleared
  // first and here. Any future calls to EXCEPTION_MARK requires
  // that no pending exceptions exist.
-  JavaThread* THREAD = JavaThread::current(); // can't be NULL
+  JavaThread* THREAD = JavaThread::current(); // can't be nullptr


Change to null please

dholmes-ora · 2023-01-23T00:31:21Z

src/hotspot/share/runtime/javaCalls.cpp

@@ -95,7 +95,7 @@ JavaCallWrapper::JavaCallWrapper(const methodHandle& callee_method, Handle recei
  debug_only(_thread->inc_java_call_counter());
  _thread->set_active_handles(new_handles);     // install new handle block and reset Java frame linkage

-  assert (_thread->thread_state() != _thread_in_native, "cannot set native pc to NULL");
+  assert (_thread->thread_state() != _thread_in_native, "cannot set native pc to null");


FYI this assertion message seems wrong and in fact the assertion is redundant so I'm removing it in #12134.

OK, deleting it to ensure it doesn't accidentally get pushed back in.

dholmes-ora · 2023-01-23T00:45:58Z

src/hotspot/share/runtime/os.hpp

  static char* iso8601_time(jlong milliseconds_since_19700101, char* buffer,
                            size_t buffer_length, bool utc = false);

  // Fill in buffer with current local time as an ISO-8601 string.
  // E.g., YYYY-MM-DDThh:mm:ss.mmm+zzzz.
-  // Returns buffer, or NULL if it failed.
+  // Returns buffer, or nullptr if it failed.


Should be "null" to be consistent with L294

dholmes-ora · 2023-01-23T00:54:24Z

src/hotspot/share/runtime/sharedRuntime.cpp

  // to patch. If we hit the window where the callee has a c2i in the
-  // from_compiled_entry and the NULL isn't present yet then we lose the race
+  // from_compiled_entry and the nullptr isn't present yet then we lose the race


null for consistency

dholmes-ora · 2023-01-23T01:08:42Z

src/hotspot/share/runtime/threadSMR.hpp

@@ -347,7 +347,7 @@ class JavaThreadIterator : public StackObj {

 public:
  JavaThreadIterator(ThreadsList *list) : _list(list), _index(0) {
-    assert(list != NULL, "ThreadsList must not be NULL.");
+    assert(list != nullptr, "ThreadsList must not be nullptr.");


dholmes-ora · 2023-01-23T01:17:44Z

src/hotspot/share/runtime/vmStructs.hpp

  static VMStructEntry localHotSpotVMStructs[];
  // The function to get localHotSpotVMStructs length
  static size_t localHotSpotVMStructsLength() NOT_VM_STRUCTS_RETURN_(0);

  // The last entry is identified over in the serviceability agent by
-  // the fact that it has a NULL typeName
+  // the fact that it has a nullptr typeName


null for consistency

dholmes-ora · 2023-01-23T01:20:29Z

src/hotspot/share/runtime/mutexLocker.cpp

@@ -172,7 +172,7 @@ static int _num_mutex;
 #ifdef ASSERT
 void assert_locked_or_safepoint(const Mutex* lock) {
  // check if this thread owns the lock (common case)
-  assert(lock != NULL, "Need non-NULL lock");
+  assert(lock != nullptr, "Need non-nullptr lock");


null for consistency

robehn · 2023-01-23T08:42:38Z

Looks good but a few cases where nullptr should be null in comments for consistency with surrounding changes if nothing else.

Yes, good. The terminology used by posix is: "null pointer", so using lower case null I think is good.

dholmes-ora

Looks good! Thanks.

jdksjolen · 2023-01-25T10:28:50Z

Passes tier1.

/integrate

openjdk · 2023-01-25T10:30:09Z

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

3c61d5a: 8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
b2071f7: 8300657: Remove null filtering in CLD oop handle area
95fafd0: 8300644: Remove gc/shenandoah/jni/TestStringCriticalWithDedup.java
5a478ef: 8297730: C2: Arraycopy intrinsic throws incorrect exception
7465de4: 6603771: Nimbus L&F: Ctrl+F7 keybinding for Jinternal Frame throws a NPE.
fbe5ab0: 8300830: Remove redundant assertion in src/hotspot/share/runtime/javaCalls.cpp
1339461: 8300981: Build failure on 32-bit platforms after JDK-8281213
81d523d: Merge
60b8a98: 8300591: @SuppressWarnings option "lossy-conversions" missing from jdk.compiler module javadoc
a3ed7e9: 8300623: Lambda deserialization regression involving Enum method reference
... and 77 more: https://git.openjdk.org/jdk/compare/e326b86d37cec3b395b88598cf30ce4239732a15...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-01-25T10:30:30Z

@jdksjolen Pushed as commit 71107f4.

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

jdksjolen force-pushed the JDK-8300651 branch from 0fc7d42 to ced9a99 Compare January 19, 2023 12:31

openjdk bot added the hotspot hotspot-dev@openjdk.org label Jan 19, 2023

jdksjolen force-pushed the JDK-8300651 branch 2 times, most recently from 730f042 to 188cab6 Compare January 19, 2023 12:38

Replace NULL with nullptr in share/runtime/

89f96be

jdksjolen force-pushed the JDK-8300651 branch from 188cab6 to 89f96be Compare January 19, 2023 12:43

jdksjolen added 3 commits January 19, 2023 14:07

Fixes

c2441c5

fixes

33b6fb0

More manual fixes

64d2c22

jdksjolen marked this pull request as ready for review January 19, 2023 13:40

openjdk bot added the rfr Pull request is ready for review label Jan 19, 2023

robehn approved these changes Jan 20, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 20, 2023

dholmes-ora suggested changes Jan 23, 2023

View reviewed changes

jdksjolen mentioned this pull request Jan 23, 2023

JDK-8300240: Replace NULL with nullptr in share/ci/ #12029

Closed

3 tasks

More manual fixes from DHolmes

f71c64b

dholmes-ora approved these changes Jan 25, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jan 25, 2023

openjdk bot closed this Jan 25, 2023

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8300651: Replace NULL with nullptr in share/runtime/ #12094

JDK-8300651: Replace NULL with nullptr in share/runtime/ #12094

jdksjolen commented Jan 19, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jan 19, 2023

openjdk bot commented Jan 19, 2023

mlbridge bot commented Jan 19, 2023 •

edited

Loading

jdksjolen commented Jan 19, 2023

robehn left a comment

openjdk bot commented Jan 20, 2023 •

edited

Loading

dholmes-ora left a comment

dholmes-ora Jan 23, 2023

dholmes-ora Jan 23, 2023

dholmes-ora Jan 23, 2023

jdksjolen Jan 24, 2023

dholmes-ora Jan 23, 2023

dholmes-ora Jan 23, 2023

dholmes-ora Jan 23, 2023

dholmes-ora Jan 23, 2023

dholmes-ora Jan 23, 2023

robehn commented Jan 23, 2023

dholmes-ora left a comment

jdksjolen commented Jan 25, 2023

openjdk bot commented Jan 25, 2023

openjdk bot commented Jan 25, 2023

JDK-8300651: Replace NULL with nullptr in share/runtime/ #12094

JDK-8300651: Replace NULL with nullptr in share/runtime/ #12094

Conversation

jdksjolen commented Jan 19, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jan 19, 2023

openjdk bot commented Jan 19, 2023

mlbridge bot commented Jan 19, 2023 • edited Loading

Webrevs

jdksjolen commented Jan 19, 2023

robehn left a comment

Choose a reason for hiding this comment

openjdk bot commented Jan 20, 2023 • edited Loading

dholmes-ora left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

robehn commented Jan 23, 2023

dholmes-ora left a comment

Choose a reason for hiding this comment

jdksjolen commented Jan 25, 2023

openjdk bot commented Jan 25, 2023

openjdk bot commented Jan 25, 2023

jdksjolen commented Jan 19, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 19, 2023 •

edited

Loading

openjdk bot commented Jan 20, 2023 •

edited

Loading