*** old/src/share/vm/runtime/vmStructs.cpp	Mon May 10 09:00:11 2010
--- new/src/share/vm/runtime/vmStructs.cpp	Mon May 10 09:00:11 2010

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
!  * Copyright 2000-2010 Sun Microsystems, Inc.  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.

*** 605,616 ****
--- 605,614 ----
    nonstatic_field(CodeBlob,                    _header_size,                                  int)                                   \
    nonstatic_field(CodeBlob,                    _relocation_size,                              int)                                   \
    nonstatic_field(CodeBlob,                    _instructions_offset,                          int)                                   \
    nonstatic_field(CodeBlob,                    _frame_complete_offset,                        int)                                   \
    nonstatic_field(CodeBlob,                    _data_offset,                                  int)                                   \
    nonstatic_field(CodeBlob,                    _oops_offset,                                  int)                                   \
    nonstatic_field(CodeBlob,                    _oops_length,                                  int)                                   \
    nonstatic_field(CodeBlob,                    _frame_size,                                   int)                                   \
    nonstatic_field(CodeBlob,                    _oop_maps,                                     OopMapSet*)                            \
                                                                                                                                       \
    /**************************************************/                                                                               \
    /* NMethods (NOTE: incomplete, but only a little) */                                                                               \

*** 624,633 ****
--- 622,633 ----
    nonstatic_field(nmethod,             _scavenge_root_state,                          jbyte)                                 \
    nonstatic_field(nmethod,             _exception_offset,                             int)                                   \
    nonstatic_field(nmethod,             _deoptimize_offset,                            int)                                   \
    nonstatic_field(nmethod,             _orig_pc_offset,                               int)                                   \
    nonstatic_field(nmethod,             _stub_offset,                                  int)                                   \
+   nonstatic_field(nmethod,             _consts_offset,                                int)                                   \
+   nonstatic_field(nmethod,             _oops_offset,                                  int)                                   \
    nonstatic_field(nmethod,             _scopes_data_offset,                           int)                                   \
    nonstatic_field(nmethod,             _scopes_pcs_offset,                            int)                                   \
    nonstatic_field(nmethod,             _dependencies_offset,                          int)                                   \
    nonstatic_field(nmethod,             _handler_table_offset,                         int)                                   \
    nonstatic_field(nmethod,             _nul_chk_table_offset,                         int)                                   \