src/share/vm/oops/instanceKlass.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.
*** 949,962 ****
    }
  #if INCLUDE_SERVICES
    virtual void collect_statistics(KlassSizeStats *sz) const;
  #endif
  
!   static int vtable_start_offset()    { return header_size(); }
!   static int vtable_length_offset()   { return offset_of(InstanceKlass, _vtable_len) / HeapWordSize; }
  
!   intptr_t* start_of_vtable() const        { return ((intptr_t*)this) + vtable_start_offset(); }
    intptr_t* start_of_itable() const        { return start_of_vtable() + align_object_offset(vtable_length()); }
    int  itable_offset_in_words() const { return start_of_itable() - (intptr_t*)this; }
  
    intptr_t* end_of_itable() const          { return start_of_itable() + itable_length(); }
  
--- 949,962 ----
    }
  #if INCLUDE_SERVICES
    virtual void collect_statistics(KlassSizeStats *sz) const;
  #endif
  
!   static ByteSize vtable_start_offset()    { return in_ByteSize(header_size() * wordSize); }
!   static ByteSize vtable_length_offset()   { return byte_offset_of(InstanceKlass, _vtable_len); }
  
!   intptr_t* start_of_vtable() const        { return (intptr_t*) ((address)this + in_bytes(vtable_start_offset())); }
    intptr_t* start_of_itable() const        { return start_of_vtable() + align_object_offset(vtable_length()); }
    int  itable_offset_in_words() const { return start_of_itable() - (intptr_t*)this; }
  
    intptr_t* end_of_itable() const          { return start_of_itable() + itable_length(); }