--- old/src/hotspot/share/gc/g1/g1HeapVerifier.cpp	2018-06-20 11:50:13.156139922 +0200
+++ new/src/hotspot/share/gc/g1/g1HeapVerifier.cpp	2018-06-20 11:50:12.936139929 +0200
@@ -37,6 +37,7 @@
 #include "gc/g1/g1StringDedup.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
@@ -61,7 +62,7 @@
 
   bool failures() { return _failures; }
 
-  template <class T> void do_oop_nv(T* p) {
+  template <class T> void do_oop_work(T* p) {
     T heap_oop = RawAccess<>::oop_load(p);
     if (!CompressedOops::is_null(heap_oop)) {
       oop obj = CompressedOops::decode_not_null(heap_oop);
@@ -76,8 +77,8 @@
     }
   }
 
-  void do_oop(oop* p)       { do_oop_nv(p); }
-  void do_oop(narrowOop* p) { do_oop_nv(p); }
+  void do_oop(oop* p)       { do_oop_work(p); }
+  void do_oop(narrowOop* p) { do_oop_work(p); }
 };
 
 class G1VerifyCodeRootOopClosure: public OopClosure {