8300244: Replace NULL with nullptr in share/interpreter/

Reviewed-by: coleenp, dholmes

Author: jdksjolen

src/hotspot/share/interpreter/abstractInterpreter.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,12 +83,12 @@ void AbstractInterpreter::print() {
 //------------------------------------------------------------------------------------------------------------------------
 // Implementation of interpreter
 
-StubQueue* AbstractInterpreter::_code                                       = NULL;
+StubQueue* AbstractInterpreter::_code                                       = nullptr;
 bool       AbstractInterpreter::_notice_safepoints                          = false;
-address    AbstractInterpreter::_rethrow_exception_entry                    = NULL;
+address    AbstractInterpreter::_rethrow_exception_entry                    = nullptr;
 
-address    AbstractInterpreter::_native_entry_begin                         = NULL;
-address    AbstractInterpreter::_native_entry_end                           = NULL;
+address    AbstractInterpreter::_native_entry_begin                         = nullptr;
+address    AbstractInterpreter::_native_entry_end                           = nullptr;
 address    AbstractInterpreter::_slow_signature_handler;
 address    AbstractInterpreter::_entry_table            [AbstractInterpreter::number_of_method_entries];
 address    AbstractInterpreter::_native_abi_to_tosca    [AbstractInterpreter::number_of_result_handlers];
@@ -97,7 +97,7 @@ address    AbstractInterpreter::_native_abi_to_tosca    [AbstractInterpreter::nu
 // Generation of complete interpreter
 
 AbstractInterpreterGenerator::AbstractInterpreterGenerator() {
-  _masm                      = NULL;
+  _masm                      = nullptr;
 }
 
 
@@ -231,7 +231,7 @@ bool AbstractInterpreter::is_not_reached(const methodHandle& method, int bci) {
         int method_index = invoke_bc.get_index_u2_cpcache(code);
         constantPoolHandle cp(Thread::current(), cpool);
         Method* resolved_method = ConstantPool::method_at_if_loaded(cp, method_index);
-        return (resolved_method == NULL);
+        return (resolved_method == nullptr);
       }
       default: ShouldNotReachHere();
     }

src/hotspot/share/interpreter/abstractInterpreter.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,8 +168,8 @@ class AbstractInterpreter: AllStatic {
   // Runtime support
 
   // length = invoke bytecode length (to advance to next bytecode)
-  static address deopt_entry(TosState state, int length) { ShouldNotReachHere(); return NULL; }
-  static address return_entry(TosState state, int length, Bytecodes::Code code) { ShouldNotReachHere(); return NULL; }
+  static address deopt_entry(TosState state, int length) { ShouldNotReachHere(); return nullptr; }
+  static address return_entry(TosState state, int length, Bytecodes::Code code) { ShouldNotReachHere(); return nullptr; }
 
   static address    rethrow_exception_entry()                   { return _rethrow_exception_entry; }
 

src/hotspot/share/interpreter/bootstrapInfo.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,9 +188,9 @@ void BootstrapInfo::resolve_args(TRAPS) {
     objArrayOop args_oop = oopFactory::new_objArray(vmClasses::Object_klass(), _argc, CHECK);
     objArrayHandle args(THREAD, args_oop);
     _pool->copy_bootstrap_arguments_at(_bss_index, 0, _argc, args, 0, true, Handle(), CHECK);
-    oop arg_oop = ((_argc == 1) ? args->obj_at(0) : (oop)NULL);
+    oop arg_oop = ((_argc == 1) ? args->obj_at(0) : (oop)nullptr);
     // try to discard the singleton array
-    if (arg_oop != NULL && !arg_oop->is_array()) {
+    if (arg_oop != nullptr && !arg_oop->is_array()) {
       // JVM treats arrays and nulls specially in this position,
       // but other things are just single arguments
       _arg_values = Handle(THREAD, arg_oop);
@@ -233,7 +233,7 @@ void BootstrapInfo::print_msg_on(outputStream* st, const char* msg) {
     os::snprintf_checked(what, sizeof(what), "indy#%d", decode_indy_index());
   else
     os::snprintf_checked(what, sizeof(what), "condy");
-  bool have_msg = (msg != NULL && strlen(msg) > 0);
+  bool have_msg = (msg != nullptr && strlen(msg) > 0);
   st->print_cr("%s%sBootstrap in %s %s@CP[%d] %s:%s%s BSMS[%d] BSM@CP[%d]%s argc=%d%s",
                 (have_msg ? msg : ""), (have_msg ? " " : ""),
                 caller()->name()->as_C_string(),
@@ -276,7 +276,7 @@ void BootstrapInfo::print_msg_on(outputStream* st, const char* msg) {
       int lines = 0;
       for (int i = 0; i < _argc; i++) {
         oop x = static_args->obj_at(i);
-        if (x != NULL) {
+        if (x != nullptr) {
           if (++lines > 6) {
             st->print_cr("  resolved arg[%d]: ...", i);
             break;

src/hotspot/share/interpreter/bootstrapInfo.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@ class BootstrapInfo : public StackObj {
   }
 
   void print() { print_msg_on(tty); }
-  void print_msg_on(outputStream* st, const char* msg = NULL);
+  void print_msg_on(outputStream* st, const char* msg = nullptr);
 };
 
 #endif // SHARE_INTERPRETER_BOOTSTRAPINFO_HPP

src/hotspot/share/interpreter/bytecode.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,7 @@ int Bytecode_tableswitch::dest_offset_at(int i) const {
 
 void Bytecode_invoke::verify() const {
   assert(is_valid(), "check invoke");
-  assert(cpcache() != NULL, "do not call this from verifier or rewriter");
+  assert(cpcache() != nullptr, "do not call this from verifier or rewriter");
 }
 
 int Bytecode_invoke::size_of_parameters() const {
@@ -208,7 +208,7 @@ BasicType Bytecode_loadconstant::result_type() const {
 }
 
 oop Bytecode_loadconstant::resolve_constant(TRAPS) const {
-  assert(_method != NULL, "must supply method to resolve constant");
+  assert(_method != nullptr, "must supply method to resolve constant");
   int index = raw_index();
   ConstantPool* constants = _method->constants();
   if (has_cache_index()) {

src/hotspot/share/interpreter/bytecode.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,10 +56,10 @@ class Bytecode: public StackObj {
 
  public:
   Bytecode(Method* method, address bcp): _bcp(bcp), _code(Bytecodes::code_at(method, addr_at(0))) {
-    assert(method != NULL, "this form requires a valid Method*");
+    assert(method != nullptr, "this form requires a valid Method*");
   }
   // Defined in ciStreams.hpp
-  inline Bytecode(const ciBytecodeStream* stream, address bcp = NULL);
+  inline Bytecode(const ciBytecodeStream* stream, address bcp = nullptr);
 
   // Attributes
   address bcp() const                            { return _bcp; }
@@ -323,7 +323,7 @@ class Bytecode_loadconstant: public Bytecode {
   Bytecode_loadconstant(const methodHandle& method, int bci): Bytecode(method(), method->bcp_from(bci)), _method(method()) { verify(); }
 
   void verify() const {
-    assert(_method != NULL, "must supply method");
+    assert(_method != nullptr, "must supply method");
     Bytecodes::Code stdc = Bytecodes::java_code(code());
     assert(stdc == Bytecodes::_ldc ||
            stdc == Bytecodes::_ldc_w ||

src/hotspot/share/interpreter/bytecodeTracer.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -201,8 +201,8 @@ void print_symbol(Symbol* sym, outputStream* st) {
 }
 
 void print_oop(oop value, outputStream* st) {
-  if (value == NULL) {
-    st->print_cr(" NULL");
+  if (value == nullptr) {
+    st->print_cr(" null");
   } else if (java_lang_String::is_instance(value)) {
     char buf[40];
     int len = java_lang_String::utf8_length(value);
@@ -256,7 +256,7 @@ bool BytecodePrinter::check_cp_cache_index(int i, int& cp_index, outputStream* s
 
   ConstantPoolCache* cache = constants->cache();
   // If rewriter hasn't run, the index is the cp_index
-  if (cache == NULL) {
+  if (cache == nullptr) {
     cp_index = i;
     return true;
   }
@@ -503,7 +503,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
     case Bytecodes::_newarray: {
         BasicType atype = (BasicType)get_index_u1();
         const char* str = type2name(atype);
-        if (str == NULL || is_reference_type(atype)) {
+        if (str == nullptr || is_reference_type(atype)) {
           assert(false, "Unidentified basic type");
         }
         st->print_cr(" %s", str);
@@ -649,9 +649,9 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
 
 void BytecodePrinter::bytecode_epilog(int bci, outputStream* st) {
   MethodData* mdo = method()->method_data();
-  if (mdo != NULL) {
+  if (mdo != nullptr) {
     ProfileData* data = mdo->bci_to_data(bci);
-    if (data != NULL) {
+    if (data != nullptr) {
       st->print("  %d", mdo->dp_to_di(data->dp()));
       st->fill_to(6);
       data->print_data_on(st, mdo);

src/hotspot/share/interpreter/bytecodeUtils.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -193,7 +193,7 @@ class ExceptionMessageBuilder : public StackObj {
   int do_instruction(int bci);
 
   bool print_NPE_cause0(outputStream *os, int bci, int slot, int max_detail,
-                        bool inner_expr = false, const char *prefix = NULL);
+                        bool inner_expr = false, const char *prefix = nullptr);
 
  public:
 
@@ -469,7 +469,7 @@ ExceptionMessageBuilder::ExceptionMessageBuilder(Method* method, int bci) :
   _stacks = new GrowableArray<SimulatedOperandStack*> (len + 1);
 
   for (int i = 0; i <= len; ++i) {
-    _stacks->push(NULL);
+    _stacks->push(nullptr);
   }
 
   // Initialize stack a bci 0.
@@ -481,7 +481,7 @@ ExceptionMessageBuilder::ExceptionMessageBuilder(Method* method, int bci) :
     for (int i = 0; i < const_method->exception_table_length(); ++i) {
       u2 index = et[i].handler_pc;
 
-      if (_stacks->at(index) == NULL) {
+      if (_stacks->at(index) == nullptr) {
         _stacks->at_put(index, new SimulatedOperandStack());
         _stacks->at(index)->push(index, T_OBJECT);
       }
@@ -499,7 +499,7 @@ ExceptionMessageBuilder::ExceptionMessageBuilder(Method* method, int bci) :
       i += do_instruction(i);
 
       // If we want the data only for a certain bci, we can possibly end early.
-      if ((bci == i) && (_stacks->at(i) != NULL)) {
+      if ((bci == i) && (_stacks->at(i) != nullptr)) {
         _all_processed = true;
         break;
       }
@@ -512,7 +512,7 @@ ExceptionMessageBuilder::ExceptionMessageBuilder(Method* method, int bci) :
 }
 
 ExceptionMessageBuilder::~ExceptionMessageBuilder() {
-  if (_stacks != NULL) {
+  if (_stacks != nullptr) {
     for (int i = 0; i < _stacks->length(); ++i) {
       delete _stacks->at(i);
     }
@@ -522,7 +522,7 @@ ExceptionMessageBuilder::~ExceptionMessageBuilder() {
 void ExceptionMessageBuilder::merge(int bci, SimulatedOperandStack* stack) {
   assert(stack != _stacks->at(bci), "Cannot merge itself");
 
-  if (_stacks->at(bci) != NULL) {
+  if (_stacks->at(bci) != nullptr) {
     stack->merge(*_stacks->at(bci));
   } else {
     // Got a new stack, so count the entries.
@@ -542,7 +542,7 @@ int ExceptionMessageBuilder::do_instruction(int bci) {
   int len = Bytecodes::java_length_at(_method, code_base + bci);
 
   // If we have no stack for this bci, we cannot process the bytecode now.
-  if (_stacks->at(bci) == NULL) {
+  if (_stacks->at(bci) == nullptr) {
     _all_processed = false;
     return len;
   }
@@ -1066,23 +1066,23 @@ int ExceptionMessageBuilder::do_instruction(int bci) {
   // Put new stack to the next instruction, if we might reach it from
   // this bci.
   if (!flow_ended) {
-    if (_stacks->at(bci + len) == NULL) {
+    if (_stacks->at(bci + len) == nullptr) {
       _added_one = true;
     }
     merge(bci + len, stack);
   }
 
   // Put the stack to the branch target too.
   if (dest_bci != -1) {
-    if (_stacks->at(dest_bci) == NULL) {
+    if (_stacks->at(dest_bci) == nullptr) {
       _added_one = true;
     }
     merge(dest_bci, stack);
   }
 
   // If we have more than one branch target, process these too.
   for (int64_t i = 0; i < dests.length(); ++i) {
-    if (_stacks->at(dests.at(i)) == NULL) {
+    if (_stacks->at(dests.at(i)) == nullptr) {
       _added_one = true;
     }
     merge(dests.at(i), stack);
@@ -1200,7 +1200,7 @@ bool ExceptionMessageBuilder::print_NPE_cause0(outputStream* os, int bci, int sl
     return false;
   }
 
-  if (_stacks->at(bci) == NULL) {
+  if (_stacks->at(bci) == nullptr) {
     return false;
   }
 
@@ -1228,7 +1228,7 @@ bool ExceptionMessageBuilder::print_NPE_cause0(outputStream* os, int bci, int sl
   }
 
   if (max_detail == _max_cause_detail &&
-      prefix != NULL &&
+      prefix != nullptr &&
       code != Bytecodes::_invokevirtual &&
       code != Bytecodes::_invokespecial &&
       code != Bytecodes::_invokestatic &&