JDK-8301068: Replace NULL with nullptr in share/jvmci/ #12183

jdksjolen · 2023-01-25T11:45:21Z

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

Reviewers

Vladimir Kozlov (@vnkozlov - Reviewer)
Tom Rodriguez (@tkrodriguez - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12183

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

Using diff file

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

bridgekeeper · 2023-01-25T11:47: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.

openjdk · 2023-01-25T11:50:04Z

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

jdksjolen

Marked fixes.

jdksjolen · 2023-01-25T11:58:03Z

src/hotspot/share/jvmci/jvmciCodeInstaller.cpp

@@ -377,19 +377,19 @@ Handle CodeInstaller::read_oop(HotSpotCompiledCodeStream* stream, u1 tag, JVMCI_
    JVMCI_ERROR_(Handle(), "unexpected oop tag: %d", tag)
  }
  if (obj == nullptr) {
-    JVMCI_THROW_MSG_(InternalError, "Constant was unexpectedly NULL", Handle());
+    JVMCI_THROW_MSG_(InternalError, "Constant was unexpectedly nullptr", Handle());


jdksjolen · 2023-01-25T11:59:27Z

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

  constantPoolHandle cp(THREAD, UNPACK_PAIR(ConstantPool, cp));
  oop obj = cp->resolve_possibly_cached_constant_at(index, CHECK_NULL);
  constantTag tag = cp->tag_at(index);
  if (tag.is_dynamic_constant() || tag.is_dynamic_constant_in_error()) {
    if (obj == Universe::the_null_sentinel()) {
-      return JVMCIENV->get_jobject(JVMCIENV->get_JavaConstant_NULL_POINTER());
+      return JVMCIENV->get_jobject(JVMCIENV->get_JavaConstant_nullptr_POINTER());


jdksjolen · 2023-01-25T12:00:26Z

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

@@ -1292,14 +1292,14 @@ void resync_vframestream_to_compiled_frame(vframeStream& vfst, intptr_t* stack_p
 }

 /*
- * Used by c2v_iterateFrames. Returns an array of any unallocated scope objects or NULL if none.
+ * Used by c2v_iterateFrames. Returns an array of any unallocated scope objects or nullptr if none.


jdksjolen · 2023-01-25T12:01:13Z

src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp

@@ -152,7 +152,7 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
  vm_page_size = os::vm_page_size();

 #define SET_TRIGFUNC(name)                                      \
-  if (StubRoutines::name() != NULL) {                           \
+  if (StubRoutines::name() != nullptr) {                           \


jdksjolen · 2023-01-25T12:01:47Z

src/hotspot/share/jvmci/jvmciEnv.cpp

@@ -1689,7 +1689,7 @@ nmethod* JVMCIEnv::get_nmethod(JVMCIObject obj) {
      return (JVMCIObjectArray) wrap(array);                                                                         \
    } else {                                                                                                         \
      JNIAccessMark jni(this);                                                                                       \
-      jobjectArray result = jni()->NewObjectArray(length, JNIJVMCI::className::clazz(), NULL);                       \
+      jobjectArray result = jni()->NewObjectArray(length, JNIJVMCI::className::clazz(), nullptr);                       \


jdksjolen · 2023-01-25T12:04:07Z

src/hotspot/share/jvmci/jvmci_globals.hpp

@@ -129,10 +129,10 @@ class fileStream;
          "Maximum size of a compiled method.")                             \
          range(0, max_jint)                                                \
                                                                            \
-  product(ccstr, JVMCILibPath, NULL, EXPERIMENTAL,                          \
+  product(ccstr, JVMCILibPath, nullptr, EXPERIMENTAL,                          \


jdksjolen · 2023-01-25T12:04:41Z

src/hotspot/share/jvmci/vmStructs_jvmci.hpp

@@ -30,24 +30,24 @@
 class JVMCIVMStructs {
 public:
  /**
-   * The last entry has a NULL fieldName.
+   * The last entry has a nullptr fieldName.


jdksjolen · 2023-01-25T12:04:45Z

src/hotspot/share/jvmci/vmStructs_jvmci.hpp

   */
  static VMStructEntry localHotSpotVMStructs[];

  /**
-   * The last entry has a NULL typeName.
+   * The last entry has a nullptr typeName.


jdksjolen · 2023-01-25T12:04:48Z

src/hotspot/share/jvmci/vmStructs_jvmci.hpp

   */
  static VMTypeEntry localHotSpotVMTypes[];

  /**
   * Table of integer constants.
-   * The last entry has a NULL typeName.
+   * The last entry has a nullptr typeName.


jdksjolen · 2023-01-25T12:04:51Z

src/hotspot/share/jvmci/vmStructs_jvmci.hpp

   */
  static VMIntConstantEntry localHotSpotVMIntConstants[];

  /**
   * Table of long constants.
-   * The last entry has a NULL typeName.
+   * The last entry has a nullptr typeName.


jdksjolen · 2023-01-25T14:44:57Z

Passes tier1.

mlbridge · 2023-01-25T15:20:02Z

Webrevs

01: Full - Incremental (6125a3e7)
00: Full (439faa97)

vnkozlov

Few missed nullptr in messages.

vnkozlov · 2023-01-25T17:24:43Z

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

    resolved_methods = init_resolved_methods(methods, JVMCIENV);
    *resolved_methods_ref = resolved_methods;
  }
-  assert(method != NULL, "method should not be NULL");
+  assert(method != nullptr, "method should not be nullptr");


nullptr in message.

vnkozlov · 2023-01-25T17:26:12Z

src/hotspot/share/jvmci/jvmciEnv.cpp

@@ -1472,14 +1472,14 @@ JVMCIObject JVMCIEnv::wrap(jobject object) {
 }

 jlong JVMCIEnv::make_oop_handle(const Handle& obj) {
-  assert(!obj.is_null(), "should only create handle for non-NULL oops");
+  assert(!obj.is_null(), "should only create handle for non-nullptr oops");


nullptr in message.

vnkozlov · 2023-01-25T17:26:31Z

src/hotspot/share/jvmci/jvmciEnv.cpp

-    if (result == NULL) {
-      JVMCI_THROW_MSG_(InternalError, "Constant was unexpectedly NULL", Handle());
+    if (result == nullptr) {
+      JVMCI_THROW_MSG_(InternalError, "Constant was unexpectedly nullptr", Handle());


nullptr in message.

vnkozlov · 2023-01-25T17:27:56Z

src/hotspot/share/jvmci/jvmciJavaClasses.cpp

@@ -199,11 +199,11 @@ void HotSpotJVMCI::compute_offsets(TRAPS) {
    return resolve(object)->is_a(className::klass());                                   \
  }                                                                                     \
  void HotSpotJVMCI::className::check(oop obj, const char* field_name, int offset) {    \
-    assert(obj != NULL, "NULL field access of %s.%s", #className, field_name); \
+    assert(obj != nullptr, "nullptr field access of %s.%s", #className, field_name); \


nullptr in message

vnkozlov · 2023-01-25T17:28:15Z

src/hotspot/share/jvmci/jvmciJavaClasses.cpp

+      assert(className::klass() != nullptr && className::klass()->is_linked(), "Class not yet linked: " #className);         \
+      assert(className::klass() != nullptr, "Class not yet loaded: " #className);                                            \


vnkozlov · 2023-01-25T17:29:45Z

src/hotspot/share/jvmci/jvmciJavaClasses.cpp

@@ -266,7 +266,7 @@ void HotSpotJVMCI::compute_offsets(TRAPS) {
 *  oop HotSpotJVMCI::Architecture::wordKind(JVMCIEnv* env, oop obj) { ... }
 * void HotSpotJVMCI::Architecture::set_wordKind(JVMCIEnv* env, oop obj, oop x) { ... }
 *
- * InstanceKlass *HotSpotJVMCI::Architecture::_klass = NULL;
+ * InstanceKlass *HotSpotJVMCI::Architecture::_klass = nullptr;


Right. This is exception case you listed: expression in comment.

vnkozlov · 2023-01-25T17:30:41Z

src/hotspot/share/jvmci/jvmciJavaClasses.cpp

@@ -621,11 +621,11 @@ JVMCI_CLASSES_DO(EMPTY2, EMPTY0, FIELD2, FIELD2, FIELD2, FIELD2, FIELD2, FIELD3,
    return jni()->IsInstanceOf(object.as_jobject(), className::clazz()) != 0;                                                     \
  }                                                                                                                               \
  void JNIJVMCI::className::check(JVMCIEnv* jvmciEnv, JVMCIObject obj, const char* field_name, jfieldID offset) {                 \
-    assert(obj.is_non_null(), "NULL field access of %s.%s", #className, field_name);                                     \
+    assert(obj.is_non_null(), "nullptr field access of %s.%s", #className, field_name);                                     \


nullptr in message

vnkozlov · 2023-01-25T17:31:47Z

src/hotspot/share/jvmci/jvmciJavaClasses.hpp

@@ -391,8 +391,8 @@ class HotSpotJVMCI {
  static void check(JVMCIEnv* jvmciEnv, JVMCIObject obj, const char* field_name, jfieldID offset);  \
  static jclass _class;                                                                             \
 public:                                                                                             \
- static jclass clazz() { assert(_class != NULL, #fullClassName " uninitialized"); return _class; }  \
- static jclass fullClassName ##_class()  { assert(_class != NULL, "uninit"); return _class; }
+ static jclass clazz() { assert(_class != nullptr, #fullClassName " uninitialized"); return _class; }  \


Should we align \ in previous lines?

vnkozlov · 2023-01-25T17:32:26Z

src/hotspot/share/jvmci/jvmciObject.hpp

@@ -65,7 +65,7 @@ class JVMCIArray : public JVMCIObject {
 class JVMCIObjectArray : public JVMCIArray {
 public:
  JVMCIObjectArray() {}
-  JVMCIObjectArray(void* v): JVMCIArray() { assert(v == NULL, "must be NULL"); }
+  JVMCIObjectArray(void* v): JVMCIArray() { assert(v == nullptr, "must be nullptr"); }


nullptr in message

vnkozlov · 2023-01-25T17:32:32Z

src/hotspot/share/jvmci/jvmciObject.hpp

@@ -74,7 +74,7 @@ class JVMCIObjectArray : public JVMCIArray {
 class JVMCIPrimitiveArray : public JVMCIArray {
 public:
  JVMCIPrimitiveArray() {}
-  JVMCIPrimitiveArray(void* v): JVMCIArray() { assert(v == NULL, "must be NULL"); }
+  JVMCIPrimitiveArray(void* v): JVMCIArray() { assert(v == nullptr, "must be nullptr"); }


nullptr in message

jdksjolen · 2023-01-26T11:34:55Z

Thanks @vnkozlov, I've fixed the issues you found!

vnkozlov

Good.

vnkozlov · 2023-01-26T19:36:47Z

You need second review from JVMCI experts. @dougxc or @tkrodriguez please look.

openjdk · 2023-01-26T19:37:25Z

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

8301068: Replace NULL with nullptr in share/jvmci/

Reviewed-by: kvn, never

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

7ddafd7: 8301189: validate-source fails after JDK-8298873
fc26d3e: 8298873: Update IllegalRecordVersion.java for changes to TLS implementation
a2a7703: 8299444: java.util.Set.copyOf allocates needlessly for empty input collections
d98a323: 8301070: Replace NULL with nullptr in share/memory/
315398c: 8221785: Let possibly_parallel_threads_do cover the same threads as threads_do
14114c2: 8301005: Clean up Copy::conjoint_*_atomic on windows
973f741: 8300968: Accessorize raw oop load in DeadCounterClosure
64ddf95: 8299858: [Metrics] Swap memory limit reported incorrectly when too large
28545dc: 8300247: Harden C1 xchg on AArch64 and PPC
3f63381: 8300913: ZGC: assert(to_addr != 0) failed: Should be forwarded
... and 113 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.

jdksjolen · 2023-01-31T12:17:55Z

Thank you, integrating.

/integrate

openjdk · 2023-01-31T12:19:51Z

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

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
7b3919d: 8301346: Remove dead emit_entry_barrier_stub definition
a6867a7: 8301378: CodeHeap has virtual methods that are not overridden
... and 186 more: https://git.openjdk.org/jdk/compare/e326b86d37cec3b395b88598cf30ce4239732a15...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-01-31T12:20:04Z

@jdksjolen Pushed as commit 90ec19e.

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

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

jdksjolen commented Jan 25, 2023

View reviewed changes

Replace NULL with nullptr in share/jvmci/

df67747

jdksjolen force-pushed the JDK-8301068 branch from 8491475 to df67747 Compare January 25, 2023 12:06

Manual fixes

439faa9

jdksjolen marked this pull request as ready for review January 25, 2023 15:12

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

vnkozlov reviewed Jan 25, 2023

View reviewed changes

vnkozlov's fixes

6125a3e

vnkozlov approved these changes Jan 26, 2023

View reviewed changes

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

tkrodriguez approved these changes Jan 26, 2023

View reviewed changes

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

openjdk bot closed this Jan 31, 2023

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8301068: Replace NULL with nullptr in share/jvmci/ #12183

JDK-8301068: Replace NULL with nullptr in share/jvmci/ #12183

jdksjolen commented Jan 25, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jan 25, 2023

openjdk bot commented Jan 25, 2023

jdksjolen left a comment

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen Jan 25, 2023

jdksjolen commented Jan 25, 2023

mlbridge bot commented Jan 25, 2023 •

edited

Loading

vnkozlov left a comment

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

vnkozlov Jan 25, 2023

jdksjolen commented Jan 26, 2023

vnkozlov left a comment

vnkozlov commented Jan 26, 2023

openjdk bot commented Jan 26, 2023 •

edited

Loading

jdksjolen commented Jan 31, 2023

openjdk bot commented Jan 31, 2023

openjdk bot commented Jan 31, 2023

		assert(className::klass() != nullptr && className::klass()->is_linked(), "Class not yet linked: " #className); \
		assert(className::klass() != nullptr, "Class not yet loaded: " #className); \

JDK-8301068: Replace NULL with nullptr in share/jvmci/ #12183

JDK-8301068: Replace NULL with nullptr in share/jvmci/ #12183

Conversation

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

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jan 25, 2023

openjdk bot commented Jan 25, 2023

jdksjolen 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

Choose a reason for hiding this comment

jdksjolen commented Jan 25, 2023

mlbridge bot commented Jan 25, 2023 • edited Loading

Webrevs

vnkozlov 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

Choose a reason for hiding this comment

jdksjolen commented Jan 26, 2023

vnkozlov left a comment

Choose a reason for hiding this comment

vnkozlov commented Jan 26, 2023

openjdk bot commented Jan 26, 2023 • edited Loading

jdksjolen commented Jan 31, 2023

openjdk bot commented Jan 31, 2023

openjdk bot commented Jan 31, 2023

jdksjolen commented Jan 25, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 25, 2023 •

edited

Loading

openjdk bot commented Jan 26, 2023 •

edited

Loading