src/hotspot/share/classfile/systemDictionary.hpp

*** 197,206 ****
--- 197,209 ----
    do_klass(StackWalker_klass,                           java_lang_StackWalker,                     Opt                 ) \
    do_klass(AbstractStackWalker_klass,                   java_lang_StackStreamFactory_AbstractStackWalker, Opt          ) \
    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                 ) \
    do_klass(Float_klass,                                 java_lang_Float,                           Pre                 ) \
    do_klass(Double_klass,                                java_lang_Double,                          Pre                 ) \
*** 447,462 ****
      assert((uint)t < T_VOID+1, "range check");
      return check_klass(_box_klasses[t]);
    }
    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.
    static ClassLoaderData *class_loader_data(Handle class_loader) {
      return ClassLoaderData::class_loader_data(class_loader());
--- 450,459 ----
*** 727,739 ****
                                  TRAPS);
  
    // 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];
  
  private:
    static oop  _java_system_loader;
--- 724,733 ----