--- old/src/hotspot/share/gc/shared/collectedHeap.cpp	2017-11-20 16:28:33.406323084 +0100
+++ new/src/hotspot/share/gc/shared/collectedHeap.cpp	2017-11-20 16:28:33.156326025 +0100
@@ -172,6 +172,7 @@
 
 CollectedHeap::CollectedHeap() :
   _barrier_set(NULL),
+  _servicability(NULL),
   _is_gc_active(false),
   _total_collections(0),
   _total_full_collections(0),
@@ -609,3 +610,11 @@
   _reserved.set_start(start);
   _reserved.set_end(end);
 }
+
+GCServicabilitySupport* CollectedHeap::servicability_support() {
+  if (_servicability == NULL) {
+    _servicability = create_servicability_support();
+  }
+  assert(_servicability != NULL, "Need servicability support");
+  return _servicability;
+}