src/share/vm/oops/klass.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, 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, 2016, 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.
*** 129,145 ****
    ClassLoaderData* _class_loader_data;
  
    jint        _modifier_flags;  // Processed access flags, for use by Class.getModifiers.
    AccessFlags _access_flags;    // Access flags. The class/interface distinction is stored here.
  
    // Biased locking implementation and statistics
    // (the 64-bit chunk goes first, to avoid some fragmentation)
    jlong    _last_biased_lock_bulk_revocation_time;
    markOop  _prototype_header;   // Used when biased locking is both enabled and disabled for this type
    jint     _biased_lock_revocation_count;
  
!   TRACE_DEFINE_KLASS_TRACE_ID;
  
    // Remembered sets support for the oops in the klasses.
    jbyte _modified_oops;             // Card Table Equivalent (YC/CMS support)
    jbyte _accumulated_modified_oops; // Mod Union Equivalent (CMS support)
  
--- 129,148 ----
    ClassLoaderData* _class_loader_data;
  
    jint        _modifier_flags;  // Processed access flags, for use by Class.getModifiers.
    AccessFlags _access_flags;    // Access flags. The class/interface distinction is stored here.
  
+   TRACE_DEFINE_KLASS_TRACE_ID;
+ 
    // Biased locking implementation and statistics
    // (the 64-bit chunk goes first, to avoid some fragmentation)
    jlong    _last_biased_lock_bulk_revocation_time;
    markOop  _prototype_header;   // Used when biased locking is both enabled and disabled for this type
    jint     _biased_lock_revocation_count;
  
!   // vtable length
!   int _vtable_len;
  
    // Remembered sets support for the oops in the klasses.
    jbyte _modified_oops;             // Card Table Equivalent (YC/CMS support)
    jbyte _accumulated_modified_oops; // Mod Union Equivalent (CMS support)
  
*** 373,383 ****
    }
  #endif
  
    // vtables
    virtual klassVtable* vtable() const = 0;
!   virtual int vtable_length() const = 0;
  
    // subclass check
    bool is_subclass_of(const Klass* k) const;
    // subtype check: true if is_subclass_of, or if k is interface and receiver implements it
    bool is_subtype_of(Klass* k) const {
--- 376,386 ----
    }
  #endif
  
    // vtables
    virtual klassVtable* vtable() const = 0;
!   int vtable_length() const { return _vtable_len; }
  
    // subclass check
    bool is_subclass_of(const Klass* k) const;
    // subtype check: true if is_subclass_of, or if k is interface and receiver implements it
    bool is_subtype_of(Klass* k) const {
*** 436,446 ****
--- 439,456 ----
  
   protected:
    virtual Klass* array_klass_impl(bool or_null, int rank, TRAPS);
    virtual Klass* array_klass_impl(bool or_null, TRAPS);
  
+   void set_vtable_length(int len) { _vtable_len= len; }
+ 
   public:
+   static ByteSize vtable_start_offset();
+   static ByteSize vtable_length_offset() {
+     return byte_offset_of(Klass, _vtable_len);
+   }
+ 
    // CDS support - remove and restore oops from metadata. Oops are not shared.
    virtual void remove_unshareable_info();
    virtual void restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS);
  
   protected: