--- old/src/share/vm/memory/metaspaceClosure.hpp	2017-07-27 12:12:28.339875767 -0700
+++ new/src/share/vm/memory/metaspaceClosure.hpp	2017-07-27 12:12:28.191870042 -0700
@@ -151,7 +151,7 @@
     virtual MetaspaceObj::Type msotype()   const { return dereference()->type(); }
 
     virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
-      return dereference()->metaspace_pointers_do(it);
+      dereference()->metaspace_pointers_do(it);
     }
     virtual void metaspace_pointers_do_at(MetaspaceClosure *it, address new_loc) const {
       ((T*)new_loc)->metaspace_pointers_do(it);
@@ -209,13 +209,13 @@
     virtual MetaspaceObj::Type msotype()   const { return MetaspaceObj::array_type(sizeof(T*)); }
 
     virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
-      _metaspace_pointers_do_at(it, dereference());
+      metaspace_pointers_do_at_impl(it, dereference());
     }
     virtual void metaspace_pointers_do_at(MetaspaceClosure *it, address new_loc) const {
-      _metaspace_pointers_do_at(it, (Array<T*>*)new_loc);
+      metaspace_pointers_do_at_impl(it, (Array<T*>*)new_loc);
     }
   private:
-    void _metaspace_pointers_do_at(MetaspaceClosure *it, Array<T*>* array) const {
+    void metaspace_pointers_do_at_impl(MetaspaceClosure *it, Array<T*>* array) const {
       log_trace(cds)("Iter(ObjectArray): %p [%d]", array, array->length());
       for (int i = 0; i < array->length(); i++) {
         T** mpp = array->adr_at(i);