--- old/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	2020-08-14 12:49:19.266543619 +0200
+++ new/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	2020-08-14 12:49:19.122540983 +0200
@@ -1437,7 +1437,7 @@
   virtual bool supports_concurrent_gc_breakpoints() const;
   bool is_heterogeneous_heap() const;
 
-  virtual WorkGang* get_safepoint_workers() { return _workers; }
+  virtual WorkGang* safepoint_workers() { return _workers; }
 
   // The methods below are here for convenience and dispatch the
   // appropriate method depending on value of the given VerifyOption
--- old/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp	2020-08-14 12:49:19.606549843 +0200
+++ new/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp	2020-08-14 12:49:19.434546695 +0200
@@ -220,7 +220,7 @@
   virtual void gc_threads_do(ThreadClosure* tc) const;
   virtual void print_tracing_info() const;
 
-  virtual WorkGang* get_safepoint_workers() { return &_workers; }
+  virtual WorkGang* safepoint_workers() { return &_workers; }
 
   PreGenGCValues get_pre_gc_values() const;
   void print_heap_change(const PreGenGCValues& pre_gc_values) const;
--- old/src/hotspot/share/gc/shared/collectedHeap.cpp	2020-08-14 12:49:19.950556141 +0200
+++ new/src/hotspot/share/gc/shared/collectedHeap.cpp	2020-08-14 12:49:19.770552845 +0200
@@ -123,7 +123,7 @@
 }
 
 void CollectedHeap::run_task_at_safepoint(AbstractGangTask* task, uint num_workers) {
-  WorkGang* gang = get_safepoint_workers();
+  WorkGang* gang = safepoint_workers();
   if (gang == NULL) {
     // GC doesn't support parallel worker threads.
     // Execute in this thread with worker id 0.
--- old/src/hotspot/share/gc/shared/collectedHeap.hpp	2020-08-14 12:49:20.294562438 +0200
+++ new/src/hotspot/share/gc/shared/collectedHeap.hpp	2020-08-14 12:49:20.114559143 +0200
@@ -504,7 +504,7 @@
   // concurrent marking) for an intermittent non-GC safepoint.
   // If this method returns NULL, SafepointSynchronize will
   // perform cleanup tasks serially in the VMThread.
-  virtual WorkGang* get_safepoint_workers() { return NULL; }
+  virtual WorkGang* safepoint_workers() { return NULL; }
 
   // Support for object pinning. This is used by JNI Get*Critical()
   // and Release*Critical() family of functions. If supported, the GC
--- old/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp	2020-08-14 12:49:20.630568589 +0200
+++ new/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp	2020-08-14 12:49:20.454565367 +0200
@@ -195,7 +195,7 @@
   void assert_gc_workers(uint nworker) NOT_DEBUG_RETURN;
 
   WorkGang* workers() const;
-  WorkGang* get_safepoint_workers();
+  WorkGang* safepoint_workers();
 
   void gc_threads_do(ThreadClosure* tcl) const;
 
--- old/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp	2020-08-14 12:49:20.974574886 +0200
+++ new/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp	2020-08-14 12:49:20.790571518 +0200
@@ -66,7 +66,7 @@
   return _workers;
 }
 
-inline WorkGang* ShenandoahHeap::get_safepoint_workers() {
+inline WorkGang* ShenandoahHeap::safepoint_workers() {
   return _safepoint_workers;
 }
 
--- old/src/hotspot/share/gc/z/zCollectedHeap.cpp	2020-08-14 12:49:21.322581257 +0200
+++ new/src/hotspot/share/gc/z/zCollectedHeap.cpp	2020-08-14 12:49:21.142577962 +0200
@@ -273,7 +273,7 @@
   // Does nothing
 }
 
-WorkGang* ZCollectedHeap::get_safepoint_workers() {
+WorkGang* ZCollectedHeap::safepoint_workers() {
   return _runtime_workers.workers();
 }
 
--- old/src/hotspot/share/gc/z/zCollectedHeap.hpp	2020-08-14 12:49:21.666587554 +0200
+++ new/src/hotspot/share/gc/z/zCollectedHeap.hpp	2020-08-14 12:49:21.486584259 +0200
@@ -105,7 +105,7 @@
   virtual void flush_nmethod(nmethod* nm);
   virtual void verify_nmethod(nmethod* nmethod);
 
-  virtual WorkGang* get_safepoint_workers();
+  virtual WorkGang* safepoint_workers();
 
   virtual void gc_threads_do(ThreadClosure* tc) const;
 
--- old/src/hotspot/share/runtime/safepoint.cpp	2020-08-14 12:49:22.010593851 +0200
+++ new/src/hotspot/share/runtime/safepoint.cpp	2020-08-14 12:49:21.830590557 +0200
@@ -587,7 +587,7 @@
 
   CollectedHeap* heap = Universe::heap();
   assert(heap != NULL, "heap not initialized yet?");
-  WorkGang* cleanup_workers = heap->get_safepoint_workers();
+  WorkGang* cleanup_workers = heap->safepoint_workers();
   if (cleanup_workers != NULL) {
     // Parallel cleanup using GC provided thread pool.
     uint num_cleanup_workers = cleanup_workers->active_workers();
--- old/src/hotspot/share/services/heapDumper.cpp	2020-08-14 12:49:22.362600295 +0200
+++ new/src/hotspot/share/services/heapDumper.cpp	2020-08-14 12:49:22.182597000 +0200
@@ -1789,7 +1789,7 @@
   set_global_dumper();
   set_global_writer();
 
-  WorkGang* gang = ch->get_safepoint_workers();
+  WorkGang* gang = ch->safepoint_workers();
 
   if (gang == NULL) {
     work(0);