src/share/vm/oops/klassVtable.hpp

*** 122,132 ****
   InstanceKlass* find_transitive_override(InstanceKlass* initialsuper, methodHandle target_method, int vtable_index,
                                           Handle target_loader, Symbol* target_classname, Thread* THREAD);
  
    // support for miranda methods
    bool is_miranda_entry_at(int i);
!   void fill_in_mirandas(int* initialized);
    static bool is_miranda(Method* m, Array<Method*>* class_methods, Klass* super);
    static void add_new_mirandas_to_lists(
        GrowableArray<Method*>* new_mirandas,
        GrowableArray<Method*>* all_mirandas,
        Array<Method*>* current_interface_methods, Array<Method*>* class_methods,
--- 122,132 ----
   InstanceKlass* find_transitive_override(InstanceKlass* initialsuper, methodHandle target_method, int vtable_index,
                                           Handle target_loader, Symbol* target_classname, Thread* THREAD);
  
    // support for miranda methods
    bool is_miranda_entry_at(int i);
!   int fill_in_mirandas(int initialized);
    static bool is_miranda(Method* m, Array<Method*>* class_methods, Klass* super);
    static void add_new_mirandas_to_lists(
        GrowableArray<Method*>* new_mirandas,
        GrowableArray<Method*>* all_mirandas,
        Array<Method*>* current_interface_methods, Array<Method*>* class_methods,
*** 286,301 ****
    bool check_no_old_or_obsolete_entries();
    void dump_itable();
  #endif // INCLUDE_JVMTI
  
    // Setup of itable
    static int compute_itable_size(Array<Klass*>* transitive_interfaces);
    static void setup_itable_offset_table(instanceKlassHandle klass);
  
    // Resolving of method to index
-   static int compute_itable_index(Method* m);
-   // ...and back again:
    static Method* method_for_itable_index(Klass* klass, int itable_index);
  
    // Debugging/Statistics
    static void print_statistics() PRODUCT_RETURN;
   private:
--- 286,301 ----
    bool check_no_old_or_obsolete_entries();
    void dump_itable();
  #endif // INCLUDE_JVMTI
  
    // Setup of itable
+   static int assign_itable_indexes_for_interface(Klass* klass);
+   static int method_count_for_interface(Klass* klass);
    static int compute_itable_size(Array<Klass*>* transitive_interfaces);
    static void setup_itable_offset_table(instanceKlassHandle klass);
  
    // Resolving of method to index
    static Method* method_for_itable_index(Klass* klass, int itable_index);
  
    // Debugging/Statistics
    static void print_statistics() PRODUCT_RETURN;
   private: