src/hotspot/share/oops/instanceKlass.hpp

@@ -221,10 +221,12 @@
    // The NestHost attribute. The class info index for the class
    // that is the nest-host of this class. This data has not been validated.
    u2              _nest_host_index;
    u2              _this_class_index;        // constant pool entry
    u2              _static_oop_field_count;  // number of static oop fields in this klass
+   u2              _nonstatic_oop_field_count;// number of non-static oop fields in this klass
+   u2              _java_fields_count;       // The number of declared Java fields
  
    volatile u2     _idnum_allocated_count;   // JNI/JVMTI: increments with the addition of methods, old ids don't change
  
    volatile ClassState _init_state;          // state of class
  

@@ -337,10 +339,13 @@
    void set_static_field_size(int size)     { _static_field_size = size; }
  
    int static_oop_field_count() const       { return (int)_static_oop_field_count; }
    void set_static_oop_field_count(u2 size) { _static_oop_field_count = size; }
  
+   int nonstatic_oop_field_count() const       { return (int)_nonstatic_oop_field_count; }
+   void set_nonstatic_oop_field_count(u2 size) { _nonstatic_oop_field_count = size; }
+ 
    // Java itable
    int  itable_length() const               { return _itable_len; }
    void set_itable_length(int len)          { _itable_len = len; }
  
    // array klasses