Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/oops/fieldInfo.hpp	Fri May 18 14:57:28 2012 -0700
     1.2 +++ b/src/share/vm/oops/fieldInfo.hpp	Mon May 21 14:10:35 2012 -0400
     1.3 @@ -50,8 +50,7 @@
     1.4      initval_index_offset     = 3,
     1.5      low_offset               = 4,
     1.6      high_offset              = 5,
     1.7 -    generic_signature_offset = 6,
     1.8 -    field_slots              = 7
     1.9 +    field_slots              = 6
    1.10    };
    1.11  
    1.12   private:
    1.13 @@ -60,29 +59,28 @@
    1.14    void set_name_index(u2 val)                    { _shorts[name_index_offset] = val;         }
    1.15    void set_signature_index(u2 val)               { _shorts[signature_index_offset] = val;    }
    1.16    void set_initval_index(u2 val)                 { _shorts[initval_index_offset] = val;      }
    1.17 -  void set_generic_signature_index(u2 val)       { _shorts[generic_signature_offset] = val;  }
    1.18  
    1.19    u2 name_index() const                          { return _shorts[name_index_offset];        }
    1.20    u2 signature_index() const                     { return _shorts[signature_index_offset];   }
    1.21    u2 initval_index() const                       { return _shorts[initval_index_offset];     }
    1.22 -  u2 generic_signature_index() const             { return _shorts[generic_signature_offset]; }
    1.23  
    1.24   public:
    1.25    static FieldInfo* from_field_array(typeArrayOop fields, int index) {
    1.26      return ((FieldInfo*)fields->short_at_addr(index * field_slots));
    1.27    }
    1.28 +  static FieldInfo* from_field_array(u2* fields, int index) {
    1.29 +    return ((FieldInfo*)(fields + index * field_slots));
    1.30 +  }
    1.31  
    1.32    void initialize(u2 access_flags,
    1.33                    u2 name_index,
    1.34                    u2 signature_index,
    1.35                    u2 initval_index,
    1.36 -                  u2 generic_signature_index,
    1.37                    u4 offset) {
    1.38      _shorts[access_flags_offset] = access_flags;
    1.39      _shorts[name_index_offset] = name_index;
    1.40      _shorts[signature_index_offset] = signature_index;
    1.41      _shorts[initval_index_offset] = initval_index;
    1.42 -    _shorts[generic_signature_offset] = generic_signature_index;
    1.43      set_offset(offset);
    1.44    }
    1.45  
    1.46 @@ -105,14 +103,6 @@
    1.47      return cp->symbol_at(index);
    1.48    }
    1.49  
    1.50 -  Symbol* generic_signature(constantPoolHandle cp) const {
    1.51 -    int index = generic_signature_index();
    1.52 -    if (index == 0) {
    1.53 -      return NULL;
    1.54 -    }
    1.55 -    return cp->symbol_at(index);
    1.56 -  }
    1.57 -
    1.58    void set_access_flags(u2 val)                  { _shorts[access_flags_offset] = val;             }
    1.59    void set_offset(u4 val)                        {
    1.60      _shorts[low_offset] = extract_low_short_from_int(val);