--- a/src/hotspot/share/gc/z/zRootsIterator.cpp	Tue Aug 06 15:50:12 2019 +0200
+++ b/src/hotspot/share/gc/z/zRootsIterator.cpp	Tue Aug 06 15:50:25 2019 +0200
@@ -410,26 +410,3 @@
   _string_table.oops_do(cl);
   _resolved_method_table.oops_do(cl);
 }
-
-ZThreadRootsIterator::ZThreadRootsIterator() :
-    _threads(this) {
-  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
-  ZStatTimer timer(ZSubPhasePauseRootsSetup);
-  Threads::change_thread_claim_token();
-}
-
-ZThreadRootsIterator::~ZThreadRootsIterator() {
-  ZStatTimer timer(ZSubPhasePauseRootsTeardown);
-  Threads::assert_all_threads_claimed();
-}
-
-void ZThreadRootsIterator::do_threads(ZRootsIteratorClosure* cl) {
-  ZStatTimer timer(ZSubPhasePauseRootsThreads);
-  ResourceMark rm;
-  Threads::possibly_parallel_oops_do(true, cl, NULL);
-}
-
-void ZThreadRootsIterator::oops_do(ZRootsIteratorClosure* cl) {
-  ZStatTimer timer(ZSubPhasePauseRoots);
-  _threads.oops_do(cl);
-}

--- a/src/hotspot/share/gc/z/zRootsIterator.hpp	Tue Aug 06 15:50:12 2019 +0200
+++ b/src/hotspot/share/gc/z/zRootsIterator.hpp	Tue Aug 06 15:50:25 2019 +0200
@@ -188,17 +188,4 @@
   void oops_do(ZRootsIteratorClosure* cl);
 };
 
-class ZThreadRootsIterator {
-private:
-  void do_threads(ZRootsIteratorClosure* cl);
-
-  ZParallelOopsDo<ZThreadRootsIterator, &ZThreadRootsIterator::do_threads> _threads;
-
-public:
-  ZThreadRootsIterator();
-  ~ZThreadRootsIterator();
-
-  void oops_do(ZRootsIteratorClosure* cl);
-};
-
 #endif // SHARE_GC_Z_ZROOTSITERATOR_HPP