8254315: Shenandoah: Concurrent weak reference processing

src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp

@@ -658,7 +658,7 @@ void ShenandoahBarrierSetAssembler::gen_load_reference_barrier_stub(LIR_Assemble
       __ far_call(RuntimeAddress(bs->load_reference_barrier_normal_rt_code_blob()->code_begin()));
       break;
     case ShenandoahBarrierSet::AccessKind::WEAK:
-      __ far_call(RuntimeAddress(bs->load_reference_barrier_weakref_rt_code_blob()->code_begin()));
+      __ far_call(RuntimeAddress(bs->load_reference_barrier_weak_rt_code_blob()->code_begin()));
       break;
     case ShenandoahBarrierSet::AccessKind::NATIVE:
       __ far_call(RuntimeAddress(bs->load_reference_barrier_native_rt_code_blob()->code_begin()));

src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp

@@ -835,7 +835,7 @@ void ShenandoahBarrierSetAssembler::gen_load_reference_barrier_stub(LIR_Assemble
       __ call(RuntimeAddress(bs->load_reference_barrier_normal_rt_code_blob()->code_begin()));
       break;
     case ShenandoahBarrierSet::AccessKind::WEAK:
-      __ call(RuntimeAddress(bs->load_reference_barrier_weakref_rt_code_blob()->code_begin()));
+      __ call(RuntimeAddress(bs->load_reference_barrier_weak_rt_code_blob()->code_begin()));
       break;
     case ShenandoahBarrierSet::AccessKind::NATIVE:
       __ call(RuntimeAddress(bs->load_reference_barrier_native_rt_code_blob()->code_begin()));

src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp

@@ -53,7 +53,7 @@ ShenandoahBarrierSetC1::ShenandoahBarrierSetC1() :
   _pre_barrier_c1_runtime_code_blob(NULL),
   _load_reference_barrier_normal_rt_code_blob(NULL),
   _load_reference_barrier_native_rt_code_blob(NULL),
-  _load_reference_barrier_weakref_rt_code_blob(NULL) {}
+  _load_reference_barrier_weak_rt_code_blob(NULL) {}
 
 void ShenandoahBarrierSetC1::pre_barrier(LIRGenerator* gen, CodeEmitInfo* info, DecoratorSet decorators, LIR_Opr addr_opr, LIR_Opr pre_val) {
   // First we test whether marking is in progress.
@@ -281,9 +281,9 @@ void ShenandoahBarrierSetC1::generate_c1_runtime_stubs(BufferBlob* buffer_blob)
                                                                           "shenandoah_load_reference_barrier_native_slow",
                                                                           false, &lrb_native_code_gen_cl);
 
-    C1ShenandoahLoadReferenceBarrierCodeGenClosure lrb_weakref_code_gen_cl(ShenandoahBarrierSet::AccessKind::WEAK);
-    _load_reference_barrier_weakref_rt_code_blob = Runtime1::generate_blob(buffer_blob, -1,
-                                                                           "shenandoah_load_reference_barrier_weakref_slow",
-                                                                           false, &lrb_weakref_code_gen_cl);
+    C1ShenandoahLoadReferenceBarrierCodeGenClosure lrb_weak_code_gen_cl(ShenandoahBarrierSet::AccessKind::WEAK);
+    _load_reference_barrier_weak_rt_code_blob = Runtime1::generate_blob(buffer_blob, -1,
+                                                                           "shenandoah_load_reference_barrier_weak_slow",
+                                                                           false, &lrb_weak_code_gen_cl);
   }
 }

src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp

@@ -192,7 +192,7 @@ class ShenandoahBarrierSetC1 : public BarrierSetC1 {
   CodeBlob* _pre_barrier_c1_runtime_code_blob;
   CodeBlob* _load_reference_barrier_normal_rt_code_blob;
   CodeBlob* _load_reference_barrier_native_rt_code_blob;
-  CodeBlob* _load_reference_barrier_weakref_rt_code_blob;
+  CodeBlob* _load_reference_barrier_weak_rt_code_blob;
 
   void pre_barrier(LIRGenerator* gen, CodeEmitInfo* info, DecoratorSet decorators, LIR_Opr addr_opr, LIR_Opr pre_val);
 
@@ -221,9 +221,9 @@ class ShenandoahBarrierSetC1 : public BarrierSetC1 {
     return _load_reference_barrier_native_rt_code_blob;
   }
 
-  CodeBlob* load_reference_barrier_weakref_rt_code_blob() {
-    assert(_load_reference_barrier_weakref_rt_code_blob != NULL, "");
-    return _load_reference_barrier_weakref_rt_code_blob;
+  CodeBlob* load_reference_barrier_weak_rt_code_blob() {
+    assert(_load_reference_barrier_weak_rt_code_blob != NULL, "");
+    return _load_reference_barrier_weak_rt_code_blob;
   }
 protected:
 

src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp

@@ -1060,7 +1060,7 @@ Node* ShenandoahBarrierSetC2::ideal_node(PhaseGVN* phase, Node* n, bool can_resh
     Node* in1 = n->in(1);
     Node* in2 = n->in(2);
 
-    // If one input is NULL, then step over the barriers (except LRB native) on the other input
+    // If one input is NULL, then step over the barriers normal LRB barriers on the other input
     if (in1->bottom_type() == TypePtr::NULL_PTR &&
         !((in2->Opcode() == Op_ShenandoahLoadReferenceBarrier) &&
           ((ShenandoahLoadReferenceBarrierNode*)in2)->kind() != ShenandoahBarrierSet::AccessKind::NORMAL)) {

src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp

@@ -50,10 +50,10 @@ class ShenandoahConcurrentMark: public CHeapObj<mtGC> {
   inline void do_task(ShenandoahObjToScanQueue* q, T* cl, ShenandoahLiveData* live_data, ShenandoahMarkTask* task);
 
   template <class T>
-  inline void do_chunked_array_start(ShenandoahObjToScanQueue* q, T* cl, oop array, bool strong);
+  inline void do_chunked_array_start(ShenandoahObjToScanQueue* q, T* cl, oop array, bool weak);
 
   template <class T>
-  inline void do_chunked_array(ShenandoahObjToScanQueue* q, T* cl, oop array, int chunk, int pow, bool strong);
+  inline void do_chunked_array(ShenandoahObjToScanQueue* q, T* cl, oop array, int chunk, int pow, bool weak);
 
   inline void count_liveness(ShenandoahLiveData* live_data, oop obj);