8283566: G1: Improve G1BarrierSet::enqueue performance

src/hotspot/share/gc/g1/g1BarrierSet.hpp

@@ -58,8 +58,8 @@ class G1BarrierSet: public CardTableBarrierSet {
   // Add "pre_val" to a set of objects that may have been disconnected from the
   // pre-marking object graph. Prefer the version that takes location, as it
   // can avoid touching the heap unnecessarily.
-  template <class T> static void enqueue(T* dst);
-  static void enqueue_oop(oop pre_val);
+  template <class T> static void enqueue_loc(T* dst);
+  static void enqueue(oop pre_val);
 
   static void enqueue_if_weak(DecoratorSet decorators, oop value);
 

src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp

@@ -34,7 +34,7 @@
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.hpp"
 
-inline void G1BarrierSet::enqueue_oop(oop pre_val) {
+inline void G1BarrierSet::enqueue(oop pre_val) {
   // Nulls should have been already filtered.
   assert(oopDesc::is_oop(pre_val, true), "Error");
 
@@ -46,7 +46,7 @@ inline void G1BarrierSet::enqueue_oop(oop pre_val) {
 }
 
 template <class T>
-inline void G1BarrierSet::enqueue(T* dst) {
+inline void G1BarrierSet::enqueue_loc(T* dst) {
   G1SATBMarkQueueSet& queue_set = G1BarrierSet::satb_mark_queue_set();
   if (!queue_set.is_active()) return;
 
@@ -64,7 +64,7 @@ inline void G1BarrierSet::write_ref_field_pre(T* field) {
     return;
   }
 
-  enqueue(field);
+  enqueue_loc(field);
 }
 
 template <DecoratorSet decorators, typename T>
@@ -86,7 +86,7 @@ inline void G1BarrierSet::enqueue_if_weak(DecoratorSet decorators, oop value) {
   const bool needs_enqueue     = (!peek && !on_strong_oop_ref);
 
   if (needs_enqueue && value != NULL) {
-    enqueue_oop(value);
+    enqueue(value);
   }
 }
 

src/hotspot/share/gc/g1/g1CollectedHeap.cpp

@@ -2279,7 +2279,7 @@ void G1CollectedHeap::object_iterate_parallel(ObjectClosure* cl, uint worker_id,
 }
 
 void G1CollectedHeap::keep_alive(oop obj) {
-  G1BarrierSet::enqueue_oop(obj);
+  G1BarrierSet::enqueue(obj);
 }
 
 void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {