src/hotspot/share/classfile/systemDictionary.hpp

*** 653,667 ****
    static InstanceKlass* find_shared_class(Symbol* class_name);
  
    // Setup link to hierarchy
    static void add_to_hierarchy(InstanceKlass* k, TRAPS);
  
-   // We pass in the hashtable index so we can calculate it outside of
-   // the SystemDictionary_lock.
- 
    // Basic find on loaded classes
!   static InstanceKlass* find_class(int index, unsigned int hash,
                                     Symbol* name, Dictionary* dictionary);
    static InstanceKlass* find_class(Symbol* class_name, ClassLoaderData* loader_data);
  
    // Basic find on classes in the midst of being loaded
    static Symbol* find_placeholder(Symbol* name, ClassLoaderData* loader_data);
--- 653,664 ----
    static InstanceKlass* find_shared_class(Symbol* class_name);
  
    // Setup link to hierarchy
    static void add_to_hierarchy(InstanceKlass* k, TRAPS);
  
    // Basic find on loaded classes
!   static InstanceKlass* find_class(unsigned int hash,
                                     Symbol* name, Dictionary* dictionary);
    static InstanceKlass* find_class(Symbol* class_name, ClassLoaderData* loader_data);
  
    // Basic find on classes in the midst of being loaded
    static Symbol* find_placeholder(Symbol* name, ClassLoaderData* loader_data);
*** 683,696 ****
  
    // Initialization
    static void initialize_preloaded_classes(TRAPS);
  
    // Class loader constraints
!   static void check_constraints(int index, unsigned int hash,
                                  InstanceKlass* k, Handle loader,
                                  bool defining, TRAPS);
!   static void update_dictionary(int d_index, unsigned int d_hash,
                                  int p_index, unsigned int p_hash,
                                  InstanceKlass* k, Handle loader,
                                  TRAPS);
  
    // Variables holding commonly used klasses (preloaded)
--- 680,693 ----
  
    // Initialization
    static void initialize_preloaded_classes(TRAPS);
  
    // Class loader constraints
!   static void check_constraints(unsigned int hash,
                                  InstanceKlass* k, Handle loader,
                                  bool defining, TRAPS);
!   static void update_dictionary(unsigned int d_hash,
                                  int p_index, unsigned int p_hash,
                                  InstanceKlass* k, Handle loader,
                                  TRAPS);
  
    // Variables holding commonly used klasses (preloaded)