--- a/src/hotspot/share/gc/g1/g1RemSet.cpp	Sun Sep 22 17:17:58 2019 -0700
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp	Mon Sep 23 11:36:53 2019 +0200
@@ -830,7 +830,7 @@
 
     G1ScanCardClosure scan_cl(G1CollectedHeap::heap(), _pss);
     G1ScanRSForOptionalClosure cl(G1CollectedHeap::heap(), &scan_cl);
-    _opt_refs_scanned += opt_rem_set_list->oops_do(&cl, _pss->closures()->raw_strong_oops());
+    _opt_refs_scanned += opt_rem_set_list->oops_do(&cl, _pss->closures()->strong_oops());
     _opt_refs_memory_used += opt_rem_set_list->used_memory();
 
     event.commit(GCId::current(), _worker_id, G1GCPhaseTimes::phase_name(_scan_phase));

--- a/src/hotspot/share/gc/g1/g1RootClosures.cpp	Sun Sep 22 17:17:58 2019 -0700
+++ b/src/hotspot/share/gc/g1/g1RootClosures.cpp	Mon Sep 23 11:36:53 2019 +0200
@@ -47,8 +47,6 @@
   CodeBlobClosure* strong_codeblobs()      { return &_closures._codeblobs; }
   CodeBlobClosure* weak_codeblobs()        { return &_closures._codeblobs; }
 
-  OopClosure* raw_strong_oops() { return &_closures._oops; }
-
   bool trace_metadata()         { return false; }
 };
 
@@ -90,8 +88,6 @@
   CodeBlobClosure* strong_codeblobs()      { return &_strong._codeblobs; }
   CodeBlobClosure* weak_codeblobs()        { return &_weak._codeblobs; }
 
-  OopClosure* raw_strong_oops() { return &_strong._oops; }
-
   // If we are not marking all weak roots then we are tracing
   // which metadata is alive.
   bool trace_metadata()         { return MarkWeak == G1MarkPromotedFromRoot; }

--- a/src/hotspot/share/gc/g1/g1RootClosures.hpp	Sun Sep 22 17:17:58 2019 -0700
+++ b/src/hotspot/share/gc/g1/g1RootClosures.hpp	Mon Sep 23 11:36:53 2019 +0200
@@ -53,9 +53,6 @@
   // CLDs are guaranteed to have been processed.
   virtual CLDClosure* second_pass_weak_clds() = 0;
 
-  // Get a raw oop closure for processing oops, bypassing the flushing above.
-  virtual OopClosure* raw_strong_oops() = 0;
-
   // Applied to code blobs treated as weak roots.
   virtual CodeBlobClosure* weak_codeblobs() = 0;