--- old/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp	2020-06-25 15:09:47.456268715 +0200
+++ new/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp	2020-06-25 15:09:47.356267254 +0200
@@ -25,6 +25,7 @@
 #ifndef SHARE_GC_G1_G1GCPHASETIMES_HPP
 #define SHARE_GC_G1_G1GCPHASETIMES_HPP
 
+#include "gc/shared/oopStorageSet.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/weakProcessorPhaseTimes.hpp"
 #include "logging/logLevel.hpp"
@@ -48,15 +49,16 @@
     ExtRootScan,
     ThreadRoots,
     UniverseRoots,
-    JNIRoots,
     ObjectSynchronizerRoots,
     ManagementRoots,
-    VMGlobalRoots,
     CLDGRoots,
     JVMTIRoots,
     AOT_ONLY(AOTCodeRoots COMMA)
     CMRefRoots,
-    MergeER,
+    // For every OopStorage there will be one element in the enum, starting with
+    // StrongOopStorageSetRoots.
+    StrongOopStorageSetRoots,
+    MergeER = StrongOopStorageSetRoots + OopStorageSet::strong_count,
     MergeRS,
     OptMergeRS,
     MergeLB,
@@ -84,7 +86,7 @@
   };
 
   static const GCParPhases ExtRootScanSubPhasesFirst = ThreadRoots;
-  static const GCParPhases ExtRootScanSubPhasesLast = CMRefRoots;
+  static const GCParPhases ExtRootScanSubPhasesLast = GCParPhases(MergeER - 1);
 
   enum GCMergeRSWorkTimes {
     MergeRSMergedSparse,