src/share/vm/oops/klassVtable.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 88,116 ****
        int* vtable_length, int* num_new_mirandas,
        GrowableArray<Method*>* all_mirandas, Klass* super,
        Array<Method*>* methods, AccessFlags class_flags, Handle classloader,
        Symbol* classname, Array<Klass*>* local_interfaces, TRAPS);
  
    // RedefineClasses() API support:
    // If any entry of this vtable points to any of old_methods,
    // replace it with the corresponding new_method.
    // trace_name_printed is set to true if the current call has
    // printed the klass name so that other routines in the adjust_*
    // group don't print the klass name.
    void adjust_method_entries(Method** old_methods, Method** new_methods,
                               int methods_length, bool * trace_name_printed);
  
    // Debugging code
    void print()                                              PRODUCT_RETURN;
    void verify(outputStream* st, bool force = false);
    static void print_statistics()                            PRODUCT_RETURN;
  
- #ifndef PRODUCT
-   bool check_no_old_entries();
-   void dump_vtable();
- #endif
- 
   protected:
    friend class vtableEntry;
   private:
    enum { VTABLE_TRANSITIVE_OVERRIDE_VERSION = 51 } ;
    void copy_vtable_to(vtableEntry* start);
--- 88,115 ----
        int* vtable_length, int* num_new_mirandas,
        GrowableArray<Method*>* all_mirandas, Klass* super,
        Array<Method*>* methods, AccessFlags class_flags, Handle classloader,
        Symbol* classname, Array<Klass*>* local_interfaces, TRAPS);
  
+ #if INCLUDE_JVMTI
    // RedefineClasses() API support:
    // If any entry of this vtable points to any of old_methods,
    // replace it with the corresponding new_method.
    // trace_name_printed is set to true if the current call has
    // printed the klass name so that other routines in the adjust_*
    // group don't print the klass name.
    void adjust_method_entries(Method** old_methods, Method** new_methods,
                               int methods_length, bool * trace_name_printed);
+   bool check_no_old_or_obsolete_entries();
+   void dump_vtable();
+ #endif // INCLUDE_JVMTI
  
    // Debugging code
    void print()                                              PRODUCT_RETURN;
    void verify(outputStream* st, bool force = false);
    static void print_statistics()                            PRODUCT_RETURN;
  
   protected:
    friend class vtableEntry;
   private:
    enum { VTABLE_TRANSITIVE_OVERRIDE_VERSION = 51 } ;
    void copy_vtable_to(vtableEntry* start);
*** 273,290 ****
--- 272,293 ----
    void initialize_itable(bool checkconstraints, TRAPS);
  
    // Updates
    void initialize_with_method(Method* m);
  
+ #if INCLUDE_JVMTI
    // RedefineClasses() API support:
    // if any entry of this itable points to any of old_methods,
    // replace it with the corresponding new_method.
    // trace_name_printed is set to true if the current call has
    // printed the klass name so that other routines in the adjust_*
    // group don't print the klass name.
    void adjust_method_entries(Method** old_methods, Method** new_methods,
                               int methods_length, bool * trace_name_printed);
+   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);
  
*** 305,317 ****
    // Statistics
    NOT_PRODUCT(static int  _total_classes;)   // Total no. of classes with itables
    NOT_PRODUCT(static long _total_size;)      // Total no. of bytes used for itables
  
    static void update_stats(int size) PRODUCT_RETURN NOT_PRODUCT({ _total_classes++; _total_size += size; })
- 
-  public:
- #ifndef PRODUCT
-   bool check_no_old_entries();
- #endif
  };
  
  #endif // SHARE_VM_OOPS_KLASSVTABLE_HPP
--- 308,315 ----