8309044: Replace NULL with nullptr, final sweep of hotspot code

src/hotspot/cpu/ppc/macroAssembler_ppc.hpp

@@ -732,7 +732,7 @@ class MacroAssembler: public Assembler {
 
   // Load/Store klass oop from klass field. Compress.
   void load_klass(Register dst, Register src);
-  void load_klass_check_null(Register dst, Register src, Label* is_null = NULL);
+  void load_klass_check_null(Register dst, Register src, Label* is_null = nullptr);
   void store_klass(Register dst_oop, Register klass, Register tmp = R0);
   void store_klass_gap(Register dst_oop, Register val = noreg); // Will store 0 if val not specified.
 

src/hotspot/cpu/ppc/stubGenerator_ppc.cpp

@@ -4697,7 +4697,7 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::_call_stub_entry                  = generate_call_stub(StubRoutines::_call_stub_return_address);
     StubRoutines::_catch_exception_entry            = generate_catch_exception();
 
-    if (UnsafeCopyMemory::_table == NULL) {
+    if (UnsafeCopyMemory::_table == nullptr) {
       UnsafeCopyMemory::create_table(8);
     }
 

src/hotspot/cpu/ppc/templateTable_ppc_64.cpp

@@ -2294,7 +2294,7 @@ void TemplateTable::load_invokedynamic_entry(Register method) {
   __ load_resolved_indy_entry(cache, index);
   __ ld_ptr(method, array_base_offset + in_bytes(ResolvedIndyEntry::method_offset()), cache);
 
-  // The invokedynamic is unresolved iff method is nullptr
+  // The invokedynamic is unresolved iff method is null
   __ cmpdi(CCR0, method, 0);
   __ bne(CCR0, resolved);
 

src/hotspot/cpu/riscv/codeBuffer_riscv.cpp

@@ -71,7 +71,7 @@ static bool emit_shared_trampolines(CodeBuffer* cb, CodeBuffer::SharedTrampoline
 
   assert(requests->number_of_entries() >= 1, "at least one");
   const int total_requested_size = MacroAssembler::max_trampoline_stub_size() * requests->number_of_entries();
-  if (cb->stubs()->maybe_expand_to_ensure_remaining(total_requested_size) && cb->blob() == NULL) {
+  if (cb->stubs()->maybe_expand_to_ensure_remaining(total_requested_size) && cb->blob() == nullptr) {
     return false;
   }
 

src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp

@@ -486,5 +486,5 @@ void BarrierSetAssembler::check_oop(MacroAssembler* masm, Register obj, Register
   // make sure klass is 'reasonable', which is not zero.
   __ load_klass(obj, obj, tmp1);  // get klass
   __ testptr(obj, obj);
-  __ jcc(Assembler::zero, error); // if klass is nullptr it is broken
+  __ jcc(Assembler::zero, error); // if klass is null it is broken
 }

src/hotspot/share/gc/z/zHeap.cpp

@@ -380,7 +380,7 @@ bool ZHeap::print_location(outputStream* st, zaddress addr) const {
   st->print(PTR_FORMAT " is a zaddress: ", untype(addr));
 
   if (addr == zaddress::null) {
-    st->print_raw_cr("nullptr");
+    st->print_raw_cr("null");
     return true;
   }
 
@@ -435,7 +435,7 @@ bool ZHeap::print_location(outputStream* st, zpointer ptr) const {
   const zaddress addr =  ZPointer::uncolor(ptr);
 
   if (addr == zaddress::null) {
-    st->print_raw_cr("nullptr");
+    st->print_raw_cr("null");
     return true;
   }
 

src/hotspot/share/opto/runtime.cpp

@@ -488,7 +488,7 @@ const TypeFunc *OptoRuntime::notify_jvmti_vthread_Type() {
 
   // no result type needed
   fields = TypeTuple::fields(1);
-  fields[TypeFunc::Parms+0] = NULL; // void
+  fields[TypeFunc::Parms+0] = nullptr; // void
   const TypeTuple* range = TypeTuple::make(TypeFunc::Parms, fields);
 
   return TypeFunc::make(domain,range);

src/hotspot/share/runtime/globals.hpp

@@ -629,7 +629,7 @@ const int ObjectAlignmentInBytes = 8;
           "Exercise compiled exception handlers")                           \
                                                                             \
   develop(bool, InterceptOSException, false,                                \
-          "Start debugger when an implicit OS (e.g. null) "                 \
+          "Start debugger when an implicit OS (e.g. null pointer) "         \
           "exception happens")                                              \
                                                                             \
   product(bool, PrintCodeCache, false,                                      \