src/hotspot/share/oops/fieldStreams.hpp

*** 77,114 ****
      _generic_signature_slot = length + skipped_generic_signature_slots;
      assert(_generic_signature_slot <= _fields->length(), "");
      return num_fields;
    }
  
!   FieldStreamBase(Array<u2>* fields, const constantPoolHandle& constants, int start, int limit) {
!     _fields = fields;
!     _constants = constants;
!     _index = start;
!     int num_fields = init_generic_signature_start_slot();
!     if (limit < start) {
!       _limit = num_fields;
!     } else {
!       _limit = limit;
!     }
!   }
! 
!   FieldStreamBase(Array<u2>* fields, const constantPoolHandle& constants) {
!     _fields = fields;
!     _constants = constants;
!     _index = 0;
!     _limit = init_generic_signature_start_slot();
!   }
  
   public:
!   FieldStreamBase(InstanceKlass* klass) {
!     _fields = klass->fields();
!     _constants = klass->constants();
!     _index = 0;
!     _limit = klass->java_fields_count();
!     init_generic_signature_start_slot();
!     assert(klass == field_holder(), "");
!   }
  
    // accessors
    int index() const                 { return _index; }
  
    void next() {
--- 77,91 ----
      _generic_signature_slot = length + skipped_generic_signature_slots;
      assert(_generic_signature_slot <= _fields->length(), "");
      return num_fields;
    }
  
!   inline FieldStreamBase(Array<u2>* fields, ConstantPool* constants, int start, int limit);
  
+   inline FieldStreamBase(Array<u2>* fields, ConstantPool* constants);
   public:
!   inline FieldStreamBase(InstanceKlass* klass);
  
    // accessors
    int index() const                 { return _index; }
  
    void next() {
*** 134,148 ****
    void set_access_flags(AccessFlags flags) const {
      set_access_flags(flags.as_short());
    }
  
    Symbol* name() const {
!     return field()->name(_constants);
    }
  
    Symbol* signature() const {
!     return field()->signature(_constants);
    }
  
    Symbol* generic_signature() const {
      if (access_flags().field_has_generic_signature()) {
        assert(_generic_signature_slot < _fields->length(), "out of bounds");
--- 111,125 ----
    void set_access_flags(AccessFlags flags) const {
      set_access_flags(flags.as_short());
    }
  
    Symbol* name() const {
!     return field()->name(_constants());
    }
  
    Symbol* signature() const {
!     return field()->signature(_constants());
    }
  
    Symbol* generic_signature() const {
      if (access_flags().field_has_generic_signature()) {
        assert(_generic_signature_slot < _fields->length(), "out of bounds");
*** 240,249 ****
  };
  
  
  class AllFieldStream : public FieldStreamBase {
   public:
!   AllFieldStream(Array<u2>* fields, const constantPoolHandle& constants): FieldStreamBase(fields, constants) {}
    AllFieldStream(InstanceKlass* k):      FieldStreamBase(k->fields(), k->constants()) {}
  };
  
  #endif // SHARE_OOPS_FIELDSTREAMS_HPP
--- 217,226 ----
  };
  
  
  class AllFieldStream : public FieldStreamBase {
   public:
!   AllFieldStream(Array<u2>* fields, ConstantPool* constants): FieldStreamBase(fields, constants) {}
    AllFieldStream(InstanceKlass* k):      FieldStreamBase(k->fields(), k->constants()) {}
  };
  
  #endif // SHARE_OOPS_FIELDSTREAMS_HPP