--- old/src/hotspot/share/gc/shared/objectMarker.cpp	2020-02-21 11:14:10.003691004 +0100
+++ new/src/hotspot/share/gc/shared/objectMarker.cpp	2020-02-21 11:14:09.803687657 +0100
@@ -131,7 +131,7 @@
   return true;
 }
 
-// return true if object is visited
-bool DefaultObjectMarker::visited(oop o) {
+// return true if object is marked
+bool DefaultObjectMarker::marked(oop o) {
   return o->mark().is_marked();
 }
--- old/src/hotspot/share/gc/shared/objectMarker.hpp	2020-02-21 11:14:10.419697966 +0100
+++ new/src/hotspot/share/gc/shared/objectMarker.hpp	2020-02-21 11:14:10.163693682 +0100
@@ -35,19 +35,22 @@
 protected:
   bool _needs_reset;
 public:
-  virtual bool init() = 0;                       // initialize
-  virtual void done() = 0;                       // clean-up
+  // initialize
+  virtual bool init() = 0;
+  // clean-up
+  virtual void done() = 0;
 
   // mark an object if not yet marked.
   // return true if the oop is marked by this call
   virtual bool mark(oop o) = 0;
-  virtual bool visited(oop o) = 0;        // check if object has been visited
+  // check if the object has been
+  virtual bool marked(oop o) = 0;
 
   bool needs_reset() const      { return _needs_reset; }
   void set_needs_reset(bool v)  { _needs_reset = v; }
 };
 
-// ObjectMarker provides the mark and visited functions
+// Default implementation
 class DefaultObjectMarker : public ObjectMarker {
  private:
   // saved headers
@@ -60,7 +63,7 @@
   void done();
 
   bool mark(oop o);
-  bool visited(oop o);
+  bool marked(oop o);
 };
 
 #endif // SHARE_GC_SHARED_OBJECTMARKER_HPP
--- old/src/hotspot/share/gc/shenandoah/shenandoahObjectMarker.cpp	2020-02-21 11:14:10.843705061 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahObjectMarker.cpp	2020-02-21 11:14:10.587700778 +0100
@@ -26,34 +26,35 @@
 #include "precompiled.hpp"
 
 #include "gc/shared/markBitMap.inline.hpp"
+#include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahObjectMarker.hpp"
 
-  bool ShenandoahObjectMarker::init() {
-   assert(SafepointSynchronize::is_at_safepoint(), "safe iteration is only available during safepoints");
-   // Bailout if failed to commit aux bitmap
-   if (!_heap->commit_aux_bitmap()) {
-     _bit_map = NULL;
-     return false;
-   }
-   _bit_map->clear();
-   return true;
- }
+bool ShenandoahObjectMarker::init() {
+  assert(SafepointSynchronize::is_at_safepoint(), "safe iteration is only available during safepoints");
+  // Bailout if failed to commit aux bitmap
+  if (!_heap->commit_aux_bitmap()) {
+    _bit_map = NULL;
+    return false;
+  }
+  _bit_map->clear();
+  return true;
+}
 
- void ShenandoahObjectMarker::done() {
-   if (_bit_map != NULL) {
-     _heap->uncommit_aux_bit_map();
-   }
-   delete this;
- }
+void ShenandoahObjectMarker::done() {
+  if (_bit_map != NULL) {
+    _heap->uncommit_aux_bit_map();
+  }
+  delete this;
+}
 
- bool ShenandoahObjectMarker::mark(oop o) {
-   assert(_bit_map != NULL, "Should have been bailed out");
-   if (_bit_map->is_marked(o)) return false;
-   _bit_map->mark(o);
-   return true;
- }
+bool ShenandoahObjectMarker::mark(oop o) {
+  assert(_bit_map != NULL, "Should have been bailed out");
+  if (_bit_map->is_marked(o)) return false;
+  _bit_map->mark(o);
+  return true;
+}
 
- bool ShenandoahObjectMarker::visited(oop o) {
-   assert(_bit_map != NULL, "Should have been bailed out");
-   return _bit_map->is_marked(o);
- }
+bool ShenandoahObjectMarker::marked(oop o) {
+  assert(_bit_map != NULL, "Should have been bailed out");
+  return _bit_map->is_marked(o);
+}
--- old/src/hotspot/share/gc/shenandoah/shenandoahObjectMarker.hpp	2020-02-21 11:14:11.267712157 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahObjectMarker.hpp	2020-02-21 11:14:11.011707872 +0100
@@ -25,9 +25,10 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHOBJECTMARKER_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHOBJECTMARKER_HPP
 
-#include "gc/shared/markBitMap.hpp"
 #include "gc/shared/objectMarker.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
+
+class MarkBitMap;
+class ShenandoahHeap;
 
 class ShenandoahObjectMarker : public ObjectMarker {
 private:
@@ -43,7 +44,7 @@
   void done();
 
   bool mark(oop o);
-  bool visited(oop o);
+  bool marked(oop o);
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHOBJECTMARKER_HPP
--- old/src/hotspot/share/prims/jvmtiTagMap.cpp	2020-02-21 11:14:11.703719454 +0100
+++ new/src/hotspot/share/prims/jvmtiTagMap.cpp	2020-02-21 11:14:11.439715035 +0100
@@ -1776,7 +1776,7 @@
   // if the object hasn't been visited then push it onto the visit stack
   // so that it will be visited later
   static inline bool check_for_visit(oop obj) {
-    if (!_object_marker->visited(obj)) visit_stack()->push(obj);
+    if (!_object_marker->marked(obj)) visit_stack()->push(obj);
     return true;
   }