--- a/src/hotspot/share/classfile/systemDictionary.hpp Tue Jun 05 21:38:38 2018 +0200
+++ b/src/hotspot/share/classfile/systemDictionary.hpp Tue Jun 05 19:58:20 2018 -0400
@@ -199,6 +199,9 @@
do_klass(StackFrameInfo_klass, java_lang_StackFrameInfo, Opt ) \
do_klass(LiveStackFrameInfo_klass, java_lang_LiveStackFrameInfo, Opt ) \
\
+ /* support for stack dump lock analysis */ \
+ do_klass(java_util_concurrent_locks_AbstractOwnableSynchronizer_klass, java_util_concurrent_locks_AbstractOwnableSynchronizer, Pre ) \
+ \
/* Preload boxing klasses */ \
do_klass(Boolean_klass, java_lang_Boolean, Pre ) \
do_klass(Character_klass, java_lang_Character, Pre ) \
@@ -449,12 +452,6 @@
}
static BasicType box_klass_type(Klass* k); // inverse of box_klass
- // methods returning lazily loaded klasses
- // The corresponding method to load the class must be called before calling them.
- static InstanceKlass* abstract_ownable_synchronizer_klass() { return check_klass(_abstract_ownable_synchronizer_klass); }
-
- static void load_abstract_ownable_synchronizer_klass(TRAPS);
-
protected:
// Returns the class loader data to be used when looking up/updating the
// system dictionary.
@@ -729,9 +726,6 @@
// Variables holding commonly used klasses (preloaded)
static InstanceKlass* _well_known_klasses[];
- // Lazily loaded klasses
- static InstanceKlass* volatile _abstract_ownable_synchronizer_klass;
-
// table of box klasses (int_klass, etc.)
static InstanceKlass* _box_klasses[T_VOID+1];