*** old/src/share/vm/runtime/vmStructs.cpp	Tue Apr 28 11:53:34 2015
--- new/src/share/vm/runtime/vmStructs.cpp	Tue Apr 28 11:53:34 2015

*** 860,870 ****
--- 860,870 ----
    nonstatic_field(CodeBlob,                    _content_offset,                               int)                                   \
    nonstatic_field(CodeBlob,                    _code_offset,                                  int)                                   \
    nonstatic_field(CodeBlob,                    _frame_complete_offset,                        int)                                   \
    nonstatic_field(CodeBlob,                    _data_offset,                                  int)                                   \
    nonstatic_field(CodeBlob,                    _frame_size,                                   int)                                   \
!   nonstatic_field(CodeBlob,                    _oop_maps,                                     OopMapSet*)                            \
!   nonstatic_field(CodeBlob,                    _oop_maps,                                     ImmutableOopMapSet*)                   \
                                                                                                                                       \
    nonstatic_field(RuntimeStub,                 _caller_must_gc_arguments,                     bool)                                  \
                                                                                                                                       \
    /**************************************************/                                                                               \
    /* NMethods (NOTE: incomplete, but only a little) */                                                                               \

*** 966,982 ****
--- 966,988 ----
    /* OopMap and OopMapSet */                                                                                                         \
    /************************/                                                                                                         \
                                                                                                                                       \
    nonstatic_field(OopMap,                      _pc_offset,                                    int)                                   \
    nonstatic_field(OopMap,                      _omv_count,                                    int)                                   \
    nonstatic_field(OopMap,                      _omv_data_size,                                int)                                   \
    nonstatic_field(OopMap,                      _omv_data,                                     unsigned char*)                        \
    nonstatic_field(OopMap,                      _write_stream,                                 CompressedWriteStream*)                \
    nonstatic_field(OopMapSet,                   _om_count,                                     int)                                   \
    nonstatic_field(OopMapSet,                   _om_size,                                      int)                                   \
    nonstatic_field(OopMapSet,                   _om_data,                                      OopMap**)                              \
                                                                                                                                       \
+   nonstatic_field(ImmutableOopMapSet,          _count,                                        int)                                   \
+   nonstatic_field(ImmutableOopMapSet,          _size,                                         int)                                   \
+                                                                                                                                      \
+   nonstatic_field(ImmutableOopMapPair,         _pc,                                           int)                                   \
+   nonstatic_field(ImmutableOopMapPair,         _offset,                                       int)                                   \
+                                                                                                                                      \
+   nonstatic_field(ImmutableOopMap,             _count,                                        int)                                   \
+                                                                                                                                      \
    /*********************************/                                                                                                \
    /* JNIHandles and JNIHandleBlock */                                                                                                \
    /*********************************/                                                                                                \
       static_field(JNIHandles,                  _global_handles,                               JNIHandleBlock*)                       \
       static_field(JNIHandles,                  _weak_global_handles,                          JNIHandleBlock*)                       \

*** 1690,1699 ****
--- 1696,1708 ----
    /* OopMap and OopMapSet */                                              \
    /************************/                                              \
                                                                            \
    declare_toplevel_type(OopMap)                                           \
    declare_toplevel_type(OopMapSet)                                        \
+   declare_toplevel_type(ImmutableOopMapSet)                               \
+   declare_toplevel_type(ImmutableOopMapPair)                              \
+   declare_toplevel_type(ImmutableOopMap)                                  \
                                                                            \
    /********************/                                                  \
    /* CompressedStream */                                                  \
    /********************/                                                  \
                                                                            \