--- a/src/hotspot/share/memory/heapInspection.cpp	Tue Jul 09 08:05:38 2019 -0700
+++ b/src/hotspot/share/memory/heapInspection.cpp	Tue Jul 09 16:39:37 2019 +0200
@@ -792,8 +792,5 @@
 
   // Iterate over objects in the heap
   FindInstanceClosure fic(k, result);
-  // If this operation encounters a bad object when using CMS,
-  // consider using safe_object_iterate() which avoids metadata
-  // objects that may contain bad references.
-  Universe::heap()->object_iterate(&fic);
+  Universe::heap()->safe_object_iterate(&fic);
 }