Update (2023.05.17, 4th)

30733: Replace NULL with nullptr in cpu/loongarch
30732: LA port of 8304450: [vectorapi] Refactor VectorShuffle implementation

Author: loongson-jvm

src/hotspot/cpu/loongarch/abstractInterpreter_loongarch.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved.
+ * Copyright (c) 2015, 2023, Loongson Technology. 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
@@ -61,7 +61,7 @@ int AbstractInterpreter::size_top_interpreter_activation(Method* method) {
     -(frame::interpreter_frame_initial_sp_offset) + entry_size;
 
   const int stub_code = frame::entry_frame_after_call_words;
-  assert(method != NULL, "invalid method");
+  assert(method != nullptr, "invalid method");
   const int method_stack = (method->max_locals() + method->max_stack()) *
                            Interpreter::stackElementWords;
   return (overhead_size + method_stack + stub_code);
@@ -106,8 +106,8 @@ void AbstractInterpreter::layout_activation(Method* method,
                                            bool is_bottom_frame) {
   // Note: This calculation must exactly parallel the frame setup
   // in AbstractInterpreterGenerator::generate_method_entry.
-  // If interpreter_frame!=NULL, set up the method, locals, and monitors.
-  // The frame interpreter_frame, if not NULL, is guaranteed to be the
+  // If interpreter_frame!=nullptr, set up the method, locals, and monitors.
+  // The frame interpreter_frame, if not null, is guaranteed to be the
   // right size, as determined by a previous call to this method.
   // It is also guaranteed to be walkable even though it is in a skeletal state
 

src/hotspot/cpu/loongarch/assembler_loongarch.hpp

@@ -206,7 +206,7 @@ class AddressLiteral {
  protected:
   // creation
   AddressLiteral()
-    : _target(NULL)
+    : _target(nullptr)
   {}
 
   public:
@@ -1720,7 +1720,7 @@ class Assembler : public AbstractAssembler  {
   }
 
   inline void emit_data64(jlong data, RelocationHolder const& rspec, int format = 0) {
-    assert(inst_mark() != NULL, "must be inside InstructionMark");
+    assert(inst_mark() != nullptr, "must be inside InstructionMark");
     // Do not use AbstractAssembler::relocate, which is not intended for
     // embedded words.  Instead, relocate to the enclosing instruction.
     code_section()->relocate(inst_mark(), rspec, format);

src/hotspot/cpu/loongarch/c1_CodeStubs_loongarch_64.cpp

@@ -43,7 +43,7 @@ void C1SafepointPollStub::emit_code(LIR_Assembler* ce) {
   __ lea(SCR2, safepoint_pc);
   __ st_d(SCR2, Address(TREG, JavaThread::saved_exception_pc_offset()));
 
-  assert(SharedRuntime::polling_page_return_handler_blob() != NULL,
+  assert(SharedRuntime::polling_page_return_handler_blob() != nullptr,
          "polling page return stub not created yet");
   address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
 
@@ -319,7 +319,7 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
   AddressLiteral resolve(SharedRuntime::get_resolve_static_call_stub(),
                          relocInfo::static_call_type);
   address call = __ trampoline_call(resolve);
-  if (call == NULL) {
+  if (call == nullptr) {
     ce->bailout("trampoline stub overflow");
     return;
   }

src/hotspot/cpu/loongarch/c1_LIRAssembler_loongarch.hpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2022, Loongson Technology. All rights reserved.
+ * Copyright (c) 2021, 2023, Loongson Technology. 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,7 +56,7 @@ friend class ArrayCopyStub;
   void casw(Register addr, Register newval, Register cmpval, Register result, bool sign);
   void casl(Register addr, Register newval, Register cmpval, Register result);
 
-  void poll_for_safepoint(relocInfo::relocType rtype, CodeEmitInfo* info = NULL);
+  void poll_for_safepoint(relocInfo::relocType rtype, CodeEmitInfo* info = nullptr);
 
   static const int max_tableswitches = 20;
   struct tableswitch switches[max_tableswitches];