--- old/src/hotspot/share/gc/z/zCollectedHeap.cpp	2020-06-01 07:12:27.649886917 +0200
+++ new/src/hotspot/share/gc/z/zCollectedHeap.cpp	2020-06-01 07:12:27.380878247 +0200
@@ -25,6 +25,8 @@
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zDirector.hpp"
+#include "gc/z/zDriver.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zHeap.inline.hpp"
 #include "gc/z/zNMethod.hpp"
@@ -32,6 +34,8 @@
 #include "gc/z/zOop.inline.hpp"
 #include "gc/z/zServiceability.hpp"
 #include "gc/z/zStat.hpp"
+#include "gc/z/zUncommitter.hpp"
+#include "gc/z/zUnmapper.hpp"
 #include "gc/z/zUtils.inline.hpp"
 #include "memory/iterator.hpp"
 #include "memory/universe.hpp"
@@ -52,6 +56,7 @@
     _heap(),
     _director(new ZDirector()),
     _driver(new ZDriver()),
+    _unmapper(new ZUnmapper()),
     _uncommitter(new ZUncommitter()),
     _stat(new ZStat()),
     _runtime_workers() {}
@@ -81,6 +86,7 @@
 void ZCollectedHeap::stop() {
   _director->stop();
   _driver->stop();
+  _unmapper->stop();
   _uncommitter->stop();
   _stat->stop();
 }
@@ -278,6 +284,7 @@
 void ZCollectedHeap::gc_threads_do(ThreadClosure* tc) const {
   tc->do_thread(_director);
   tc->do_thread(_driver);
+  tc->do_thread(_unmapper);
   tc->do_thread(_uncommitter);
   tc->do_thread(_stat);
   _heap.worker_threads_do(tc);
@@ -330,6 +337,8 @@
   st->cr();
   _driver->print_on(st);
   st->cr();
+  _unmapper->print_on(st);
+  st->cr();
   _uncommitter->print_on(st);
   st->cr();
   _stat->print_on(st);