--- old/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp	2018-06-06 00:41:09.706801470 +0200
+++ new/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp	2018-06-06 00:41:09.449790402 +0200
@@ -195,7 +195,7 @@
 
 bool JfrTypeManager::initialize() {
   // register non-safepointing type serialization
-  for (size_t i = 0; i < 16; ++i) {
+  for (size_t i = 0; i < 18; ++i) {
     switch (i) {
     case 0: register_serializer(TYPE_FLAGVALUEORIGIN, false, true, new FlagValueOriginConstant()); break;
     case 1: register_serializer(TYPE_INFLATECAUSE, false, true, new MonitorInflateCauseConstant()); break;
@@ -213,6 +213,8 @@
     case 13: register_serializer(TYPE_CODEBLOBTYPE, false, true, new CodeBlobTypeConstant()); break;
     case 14: register_serializer(TYPE_VMOPERATIONTYPE, false, true, new VMOperationTypeConstant()); break;
     case 15: register_serializer(TYPE_THREADSTATE, false, true, new ThreadStateConstant()); break;
+    case 16: register_serializer(TYPE_ZSTATISTICSCOUNTERTYPE, false, true, new ZStatisticsCounterTypeConstant()); break;
+    case 17: register_serializer(TYPE_ZSTATISTICSSAMPLERTYPE, false, true, new ZStatisticsSamplerTypeConstant()); break;
     default:
       guarantee(false, "invariant");
     }