Mercurial > hg > release > heapstats-1.0

changeset 60:eb050c7ccede

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug 2529: HeapStats agent should hook InstanceClassLoaderKlass after JDK-6964458 reviewed-by: ykubota
author Yasumasa Suenaga <yasuenag@gmail.com>
date Thu, 16 Jul 2015 23:18:13 +0900
parents 32e54f07df8d
children 302316b4cd51
files agent/ChangeLog agent/src/oopUtil.cpp agent/src/overrideFunc.S
diffstat 3 files changed, 120 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/agent/ChangeLog	Wed Jul 15 17:14:15 2015 +0900
+++ b/agent/ChangeLog	Thu Jul 16 23:18:13 2015 +0900
@@ -1,3 +1,7 @@
+2015-07-16 Yasumasa Suenaga  <yasuenag@gmail.com>
+
+	* Bug 2529: HeapStats agent should hook InstanceClassLoaderKlass after JDK-6964458
+
 2015-07-15  KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
 
 	* Bug 2525: Prevent configure error on running rpmbuild without binutils-devel
--- a/agent/src/oopUtil.cpp	Wed Jul 15 17:14:15 2015 +0900
+++ b/agent/src/oopUtil.cpp	Thu Jul 16 23:18:13 2015 +0900
@@ -53,9 +53,12 @@
   DEFINE_OVERRIDE_FUNC_3(prefix) \
   extern "C" void *prefix##_override_func_3;
 
-#define DEFINE_OVERRIDE_FUNC_8(prefix) \
+#define DEFINE_OVERRIDE_FUNC_5(prefix) \
   DEFINE_OVERRIDE_FUNC_4(prefix) \
-  extern "C" void *prefix##_override_func_4; \
+  extern "C" void *prefix##_override_func_4;
+
+#define DEFINE_OVERRIDE_FUNC_8(prefix) \
+  DEFINE_OVERRIDE_FUNC_5(prefix) \
   extern "C" void *prefix##_override_func_5; \
   extern "C" void *prefix##_override_func_6; \
   extern "C" void *prefix##_override_func_7;
@@ -64,6 +67,11 @@
   DEFINE_OVERRIDE_FUNC_8(prefix) \
   extern "C" void *prefix##_override_func_8;
 
+#define DEFINE_OVERRIDE_FUNC_11(prefix) \
+  DEFINE_OVERRIDE_FUNC_9(prefix) \
+  extern "C" void *prefix##_override_func_9; \
+  extern "C" void *prefix##_override_func_10;
+
 
 /* Function define. */
 
@@ -78,12 +86,12 @@
 /*!
  * \brief Override function for instance object on parallelGC for after CR6964458.
  */
-DEFINE_OVERRIDE_FUNC_4(CR6964458_par)
+DEFINE_OVERRIDE_FUNC_5(CR6964458_par)
 
 /*!
  * \brief Override function for instance object on parallelGC for after CR8000213.
  */
-DEFINE_OVERRIDE_FUNC_4(CR8000213_par)
+DEFINE_OVERRIDE_FUNC_5(CR8000213_par)
 
 /*!
  * \brief Override function for instance object on parallelOldGC.
@@ -93,12 +101,12 @@
 /*!
  * \brief Override function for instance object on parallelOldGC for after CR6964458.
  */
-DEFINE_OVERRIDE_FUNC_4(CR6964458_parOld)
+DEFINE_OVERRIDE_FUNC_5(CR6964458_parOld)
 
 /*!
  * \brief Override function for instance object on parallelOldGC for after CR8000213.
  */
-DEFINE_OVERRIDE_FUNC_4(CR8000213_parOld)
+DEFINE_OVERRIDE_FUNC_5(CR8000213_parOld)
 
 /*!
  * \brief Override function for sweep at old gen on CMSGC.
@@ -113,12 +121,12 @@
 /*!
  * \brief Override function for instance object at new gen on CMSGC for after CR6964458.
  */
-DEFINE_OVERRIDE_FUNC_4(CR6964458_cms_new)
+DEFINE_OVERRIDE_FUNC_5(CR6964458_cms_new)
 
 /*!
  * \brief Override function for instance object at new gen on CMSGC for after CR8000213.
  */
-DEFINE_OVERRIDE_FUNC_4(CR8000213_cms_new)
+DEFINE_OVERRIDE_FUNC_5(CR8000213_cms_new)
 
 /*!
  * \brief Override function for instance object on G1GC.
@@ -128,22 +136,22 @@
 /*!
  * \brief Override function for instance object on G1GC for after CR6964458.
  */
-DEFINE_OVERRIDE_FUNC_9(CR6964458_g1)
+DEFINE_OVERRIDE_FUNC_11(CR6964458_g1)
 
 /*!
  * \brief Override function for instance object on G1GC for after CR8000213.
  */
-DEFINE_OVERRIDE_FUNC_9(CR8000213_g1)
+DEFINE_OVERRIDE_FUNC_11(CR8000213_g1)
 
 /*!
  * \brief Override function for instance object on G1GC for after CR8027746.
  */
-DEFINE_OVERRIDE_FUNC_9(CR8027746_g1)
+DEFINE_OVERRIDE_FUNC_11(CR8027746_g1)
 
 /*!
  * \brief Override function for instance object on G1GC for after CR8049421.
  */
-DEFINE_OVERRIDE_FUNC_9(CR8049421_g1)
+DEFINE_OVERRIDE_FUNC_11(CR8049421_g1)
 
 /*!
  * \brief Override function for cleanup event on G1GC.
@@ -498,6 +506,9 @@
   HOOK_FUNC("_ZTV16InstanceRefKlass",
     "_ZN16InstanceRefKlass19oop_follow_contentsEP7oopDesc",
     &CR6964458_par_override_func_3, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass19oop_follow_contentsEP7oopDesc",
+    &CR6964458_par_override_func_4, NULL),
   HOOK_FUNC_END
 };
 
@@ -517,6 +528,9 @@
   HOOK_FUNC("_ZTV16InstanceRefKlass",
     "_ZN16InstanceRefKlass19oop_follow_contentsEP7oopDesc",
     &CR8000213_par_override_func_3, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass19oop_follow_contentsEP7oopDesc",
+    &CR8000213_par_override_func_4, NULL),
   HOOK_FUNC_END
 };
 
@@ -570,6 +584,10 @@
     "_ZN16InstanceRefKlass19oop_follow_contents"
     "EP20ParCompactionManagerP7oopDesc",
     &CR6964458_parOld_override_func_3, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass19oop_follow_contents"
+    "EP20ParCompactionManagerP7oopDesc",
+    &CR6964458_parOld_override_func_4, NULL),
   HOOK_FUNC_END
 };
 
@@ -593,6 +611,10 @@
     "_ZN16InstanceRefKlass19oop_follow_contents"
     "EP20ParCompactionManagerP7oopDesc",
     &CR8000213_parOld_override_func_3, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass19oop_follow_contents"
+    "EP20ParCompactionManagerP7oopDesc",
+    &CR8000213_parOld_override_func_4, NULL),
   HOOK_FUNC_END
 };
 
@@ -656,6 +678,10 @@
     "_ZN16InstanceRefKlass18oop_oop_iterate_nv"
     "EP7oopDescP30Par_MarkRefsIntoAndScanClosure",
     &CR6964458_cms_new_override_func_3, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass18oop_oop_iterate_nv"
+    "EP7oopDescP30Par_MarkRefsIntoAndScanClosure",
+    &CR6964458_cms_new_override_func_4, NULL),
   HOOK_FUNC_END
 };
 
@@ -679,6 +705,10 @@
     "_ZN16InstanceRefKlass18oop_oop_iterate_nv"
     "EP7oopDescP30Par_MarkRefsIntoAndScanClosure",
     &CR8000213_cms_new_override_func_3, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass18oop_oop_iterate_nv"
+    "EP7oopDescP30Par_MarkRefsIntoAndScanClosure",
+    &CR8000213_cms_new_override_func_4, NULL),
   HOOK_FUNC_END
 };
 
@@ -743,19 +773,24 @@
   HOOK_FUNC("_ZTV16InstanceRefKlass",
     "_ZN16InstanceRefKlass18oop_oop_iterate_nvEP7oopDescP23G1RootRegionScanClosure",
     &CR6964458_g1_override_func_4, NULL),
-
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass18oop_oop_iterate_nvEP7oopDescP23G1RootRegionScanClosure",
+    &CR6964458_g1_override_func_5, NULL),
   HOOK_FUNC("_ZTV13InstanceKlass",
     "_ZN13InstanceKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR6964458_g1_override_func_5, NULL),
+    &CR6964458_g1_override_func_6, NULL),
   HOOK_FUNC("_ZTV13objArrayKlass",
     "_ZN13objArrayKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR6964458_g1_override_func_6, NULL),
+    &CR6964458_g1_override_func_7, NULL),
   HOOK_FUNC("_ZTV14typeArrayKlass",
     "_ZN14typeArrayKlass15oop_oop_iterateEP7oopDescP18ExtendedOopClosure",
-    &CR6964458_g1_override_func_7, NULL),
+    &CR6964458_g1_override_func_8, NULL),
   HOOK_FUNC("_ZTV16InstanceRefKlass",
     "_ZN16InstanceRefKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR6964458_g1_override_func_8, NULL),
+    &CR6964458_g1_override_func_9, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
+    &CR6964458_g1_override_func_10, NULL),
   HOOK_FUNC_END
 };
 
@@ -778,19 +813,24 @@
   HOOK_FUNC("_ZTV16InstanceRefKlass",
     "_ZN16InstanceRefKlass18oop_oop_iterate_nvEP7oopDescP23G1RootRegionScanClosure",
     &CR8027746_g1_override_func_4, NULL),
-
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass18oop_oop_iterate_nvEP7oopDescP23G1RootRegionScanClosure",
+    &CR8027746_g1_override_func_5, NULL),
   HOOK_FUNC("_ZTV13InstanceKlass",
     "_ZN13InstanceKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR8027746_g1_override_func_5, NULL),
+    &CR8027746_g1_override_func_6, NULL),
   HOOK_FUNC("_ZTV13ObjArrayKlass",
     "_ZN13ObjArrayKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR8027746_g1_override_func_6, NULL),
+    &CR8027746_g1_override_func_7, NULL),
   HOOK_FUNC("_ZTV14TypeArrayKlass",
     "_ZN14TypeArrayKlass15oop_oop_iterateEP7oopDescP18ExtendedOopClosure",
-    &CR8027746_g1_override_func_7, NULL),
+    &CR8027746_g1_override_func_8, NULL),
   HOOK_FUNC("_ZTV16InstanceRefKlass",
     "_ZN16InstanceRefKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR8027746_g1_override_func_8, NULL),
+    &CR8027746_g1_override_func_9, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
+    &CR8027746_g1_override_func_10, NULL),
   HOOK_FUNC_END
 };
 
@@ -813,19 +853,24 @@
   HOOK_FUNC("_ZTV16InstanceRefKlass",
     "_ZN16InstanceRefKlass18oop_oop_iterate_nvEP7oopDescP23G1RootRegionScanClosure",
     &CR8000213_g1_override_func_4, NULL),
-
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass18oop_oop_iterate_nvEP7oopDescP23G1RootRegionScanClosure",
+    &CR8000213_g1_override_func_5, NULL),
   HOOK_FUNC("_ZTV13InstanceKlass",
     "_ZN13InstanceKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR8000213_g1_override_func_5, NULL),
+    &CR8000213_g1_override_func_6, NULL),
   HOOK_FUNC("_ZTV13ObjArrayKlass",
     "_ZN13ObjArrayKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR8000213_g1_override_func_6, NULL),
+    &CR8000213_g1_override_func_7, NULL),
   HOOK_FUNC("_ZTV14TypeArrayKlass",
     "_ZN14TypeArrayKlass15oop_oop_iterateEP7oopDescP18ExtendedOopClosure",
-    &CR8000213_g1_override_func_7, NULL),
+    &CR8000213_g1_override_func_8, NULL),
   HOOK_FUNC("_ZTV16InstanceRefKlass",
     "_ZN16InstanceRefKlass18oop_oop_iterate_nvEP7oopDescP14G1CMOopClosure",
-    &CR8000213_g1_override_func_8, NULL),
+    &CR8000213_g1_override_func_9, NULL),
+  HOOK_FUNC("_ZTV24InstanceClassLoaderKlass",
+    "_ZN24InstanceClassLoaderKlass18oop_oop_iterate_nvEP7oopDescP23G1RootRegionScanClosure",
+    &CR8000213_g1_override_func_10, NULL),
   HOOK_FUNC_END
 };
 
--- a/agent/src/overrideFunc.S	Wed Jul 15 17:14:15 2015 +0900
+++ b/agent/src/overrideFunc.S	Thu Jul 16 23:18:13 2015 +0900
@@ -488,6 +488,8 @@
 OVERRIDE_OOP_FOLLOW_CONTENTS(CR6964458_par, 2)
 /* InstanceRefKlass::oop_follow_contents(oopDesc*) */
 OVERRIDE_OOP_FOLLOW_CONTENTS(CR6964458_par, 3)
+/* InstanceClassLoaderKlass::oop_follow_contents(oopDesc*) */
+OVERRIDE_OOP_FOLLOW_CONTENTS(CR6964458_par, 4)
 
 
 /* For Parallel (CR8000213). */
@@ -500,6 +502,8 @@
 OVERRIDE_OOP_FOLLOW_CONTENTS(CR8000213_par, 2)
 /* InstanceRefKlass::oop_follow_contents(oopDesc*) */
 OVERRIDE_OOP_FOLLOW_CONTENTS(CR8000213_par, 3)
+/* InstanceClassLoaderKlass::oop_follow_contents(oopDesc*) */
+OVERRIDE_OOP_FOLLOW_CONTENTS(CR8000213_par, 4)
 
 
 /* For ParallelOld. */
@@ -524,6 +528,8 @@
 OVERRIDE_PAR_OOP_FOLLOW_CONTENTS(CR6964458_parOld, 2)
 /* InstanceRefKlass::oop_follow_contents(ParCompactionManager*, oopDesc*) */
 OVERRIDE_PAR_OOP_FOLLOW_CONTENTS(CR6964458_parOld, 3)
+/* InstanceClassLoaderKlass::oop_follow_contents(ParCompactionManager*, oopDesc*) */
+OVERRIDE_PAR_OOP_FOLLOW_CONTENTS(CR6964458_parOld, 4)
 
 
 /* For ParallelOld (CR8000213). */
@@ -536,6 +542,8 @@
 OVERRIDE_PAR_OOP_FOLLOW_CONTENTS(CR8000213_parOld, 2)
 /* InstanceRefKlass::oop_follow_contents(ParCompactionManager*, oopDesc*) */
 OVERRIDE_PAR_OOP_FOLLOW_CONTENTS(CR8000213_parOld, 3)
+/* InstanceClassLoaderKlass::oop_follow_contents(ParCompactionManager*, oopDesc*) */
+OVERRIDE_PAR_OOP_FOLLOW_CONTENTS(CR8000213_parOld, 4)
 
 
 /* For CMS. */
@@ -564,6 +572,8 @@
 OVERRIDE_OOP_OOP_ITERATE(CR6964458_cms_new, 2)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, Par_MarkRefsIntoAndScanClosure*) for after CR6964458 */
 OVERRIDE_OOP_OOP_ITERATE(CR6964458_cms_new, 3)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, Par_MarkRefsIntoAndScanClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR6964458_cms_new, 4)
 
 /* InstanceKlass::oop_oop_iterate_nv(oopDesc*, Par_MarkRefsIntoAndScanClosure*) for after CR8000213 */
 OVERRIDE_OOP_OOP_ITERATE(CR8000213_cms_new, 0)
@@ -573,6 +583,8 @@
 OVERRIDE_OOP_OOP_ITERATE(CR8000213_cms_new, 2)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, Par_MarkRefsIntoAndScanClosure*) for after CR8000213 */
 OVERRIDE_OOP_OOP_ITERATE(CR8000213_cms_new, 3)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, Par_MarkRefsIntoAndScanClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR8000213_cms_new, 4)
 
 
 /* For G1. */
@@ -620,16 +632,20 @@
 OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 3)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, G1RootRegionScanClosure*) */
 OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 4)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, G1RootRegionScanClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 5)
 
 /* concurrent-mark / remark */
 /* InstanceKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 5)
+OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 6)
 /* objArrayKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 6)
+OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 7)
 /* typeArrayKlass::oop_oop_iterate(oopDesc*, ExtendedOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE_WITH_CALLER_CHECK(CR6964458_g1, 7, VTableForTypeArrayOopClosure)
+OVERRIDE_OOP_OOP_ITERATE_WITH_CALLER_CHECK(CR6964458_g1, 8, VTableForTypeArrayOopClosure)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 8)
+OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 9)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR6964458_g1, 10)
 
 /* For G1 (CR8000213). */
 
@@ -648,16 +664,20 @@
 OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 3)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, G1RootRegionScanClosure*) */
 OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 4)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, G1RootRegionScanClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 5)
 
 /* concurrent-mark / remark */
 /* InstanceKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 5)
+OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 6)
 /* ObjArrayKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 6)
+OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 7)
 /* TypeArrayKlass::oop_oop_iterate(oopDesc*, ExtendedOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE_WITH_CALLER_CHECK(CR8000213_g1, 7, VTableForTypeArrayOopClosure)
+OVERRIDE_OOP_OOP_ITERATE_WITH_CALLER_CHECK(CR8000213_g1, 8, VTableForTypeArrayOopClosure)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 8)
+OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 9)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR8000213_g1, 10)
 
 /* For G1 (CR8027746). */
 
@@ -676,16 +696,20 @@
 OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 3)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, G1RootRegionScanClosure*) */
 OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 4)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, G1RootRegionScanClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 5)
 
 /* concurrent-mark / remark */
 /* InstanceKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 5)
+OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 6)
 /* ObjArrayKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 6)
+OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 7)
 /* TypeArrayKlass::oop_oop_iterate(oopDesc*, ExtendedOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE_WITH_CALLER_CHECK(CR8027746_g1, 7, VTableForTypeArrayOopClosure)
+OVERRIDE_OOP_OOP_ITERATE_WITH_CALLER_CHECK(CR8027746_g1, 8, VTableForTypeArrayOopClosure)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 8)
+OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 9)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR8027746_g1, 10)
 
 /* For G1 (JDK-8049421). */
 
@@ -704,16 +728,20 @@
 OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 3)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, G1RootRegionScanClosure*) */
 OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 4)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, G1RootRegionScanClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 5)
 
 /* concurrent-mark / remark */
 /* InstanceKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 5)
+OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 6)
 /* ObjArrayKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 6)
+OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 7)
 /* TypeArrayKlass::oop_oop_iterate(oopDesc*, ExtendedOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE_WITH_CALLER_CHECK(CR8049421_g1, 7, VTableForTypeArrayOopClosure)
+OVERRIDE_OOP_OOP_ITERATE_WITH_CALLER_CHECK(CR8049421_g1, 8, VTableForTypeArrayOopClosure)
 /* InstanceRefKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
-OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 8)
+OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 9)
+/* InstanceClassLoaderKlass::oop_oop_iterate_nv(oopDesc*, G1CMOopClosure*) */
+OVERRIDE_OOP_OOP_ITERATE(CR8049421_g1, 10)
 
 /* G1 events */