src/hotspot/share/classfile/systemDictionary.hpp

*** 278,288 ****
    static Klass* resolve_or_null(Symbol* class_name, TRAPS);
  
    // Resolve a superclass or superinterface. Called from ClassFileParser,
    // parse_interfaces, resolve_instance_class_or_null, load_shared_class
    // "child_name" is the class whose super class or interface is being resolved.
!   static Klass* resolve_super_or_fail(Symbol* child_name,
                                        Symbol* class_name,
                                        Handle class_loader,
                                        Handle protection_domain,
                                        bool is_superclass,
                                        TRAPS);
--- 278,288 ----
    static Klass* resolve_or_null(Symbol* class_name, TRAPS);
  
    // Resolve a superclass or superinterface. Called from ClassFileParser,
    // parse_interfaces, resolve_instance_class_or_null, load_shared_class
    // "child_name" is the class whose super class or interface is being resolved.
!   static InstanceKlass* resolve_super_or_fail(Symbol* child_name,
                                                Symbol* class_name,
                                                Handle class_loader,
                                                Handle protection_domain,
                                                bool is_superclass,
                                                TRAPS);
*** 636,646 ****
    static LoaderConstraintTable* constraints() { return _loader_constraints; }
    static ResolutionErrorTable* resolution_errors() { return _resolution_errors; }
    static SymbolPropertyTable* invoke_method_table() { return _invoke_method_table; }
  
    // Basic loading operations
!   static Klass* resolve_instance_class_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS);
    static Klass* resolve_array_class_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS);
    static InstanceKlass* handle_parallel_super_load(Symbol* class_name, Symbol* supername, Handle class_loader, Handle protection_domain, Handle lockObject, TRAPS);
    // Wait on SystemDictionary_lock; unlocks lockObject before
    // waiting; relocks lockObject with correct recursion count
    // after waiting, but before reentering SystemDictionary_lock
--- 636,650 ----
    static LoaderConstraintTable* constraints() { return _loader_constraints; }
    static ResolutionErrorTable* resolution_errors() { return _resolution_errors; }
    static SymbolPropertyTable* invoke_method_table() { return _invoke_method_table; }
  
    // Basic loading operations
!   static InstanceKlass* resolve_instance_class_or_null_helper(Symbol* name,
!                                                               Handle class_loader,
!                                                               Handle protection_domain,
!                                                               TRAPS);
!   static InstanceKlass* resolve_instance_class_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS);
    static Klass* resolve_array_class_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS);
    static InstanceKlass* handle_parallel_super_load(Symbol* class_name, Symbol* supername, Handle class_loader, Handle protection_domain, Handle lockObject, TRAPS);
    // Wait on SystemDictionary_lock; unlocks lockObject before
    // waiting; relocks lockObject with correct recursion count
    // after waiting, but before reentering SystemDictionary_lock