comparison src/share/vm/oops/instanceKlass.hpp @ 4744:cd5d8cafcc84

7123315: instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count should be u2 type. Summary: Change instanceKlass::_static_oop_field_count and instanceKlass::_java_fields_count to u2 type. Reviewed-by: never, bdelsart, dholmes Contributed-by: Jiangli Zhou <jiangli.zhou@oracle.com>
author jiangli
date Wed, 28 Dec 2011 12:15:57 -0500
parents 52b5d32fbfaf
children 22cee0ee8927
comparison
equal deleted inserted replaced
4743:dca455dea3a7 4744:cd5d8cafcc84
225 225
226 // Number of heapOopSize words used by non-static fields in this klass 226 // Number of heapOopSize words used by non-static fields in this klass
227 // (including inherited fields but after header_size()). 227 // (including inherited fields but after header_size()).
228 int _nonstatic_field_size; 228 int _nonstatic_field_size;
229 int _static_field_size; // number words used by static fields (oop and non-oop) in this klass 229 int _static_field_size; // number words used by static fields (oop and non-oop) in this klass
230 int _static_oop_field_count;// number of static oop fields in this klass 230 u2 _static_oop_field_count;// number of static oop fields in this klass
231 u2 _java_fields_count; // The number of declared Java fields
231 int _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks 232 int _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks
232 int _java_fields_count; // The number of declared Java fields
233 233
234 u2 _minor_version; // minor version number of class file 234 u2 _minor_version; // minor version number of class file
235 u2 _major_version; // major version number of class file 235 u2 _major_version; // major version number of class file
236 Thread* _init_thread; // Pointer to current thread doing initialization (to handle recusive initialization) 236 Thread* _init_thread; // Pointer to current thread doing initialization (to handle recusive initialization)
237 int _vtable_len; // length of Java vtable (in words) 237 int _vtable_len; // length of Java vtable (in words)
297 void set_nonstatic_field_size(int size) { _nonstatic_field_size = size; } 297 void set_nonstatic_field_size(int size) { _nonstatic_field_size = size; }
298 298
299 int static_field_size() const { return _static_field_size; } 299 int static_field_size() const { return _static_field_size; }
300 void set_static_field_size(int size) { _static_field_size = size; } 300 void set_static_field_size(int size) { _static_field_size = size; }
301 301
302 int static_oop_field_count() const { return _static_oop_field_count; } 302 int static_oop_field_count() const { return (int)_static_oop_field_count; }
303 void set_static_oop_field_count(int size) { _static_oop_field_count = size; } 303 void set_static_oop_field_count(u2 size) { _static_oop_field_count = size; }
304 304
305 // Java vtable 305 // Java vtable
306 int vtable_length() const { return _vtable_len; } 306 int vtable_length() const { return _vtable_len; }
307 void set_vtable_length(int len) { _vtable_len = len; } 307 void set_vtable_length(int len) { _vtable_len = len; }
308 308
338 int field_access_flags(int index) const { return field(index)->access_flags(); } 338 int field_access_flags(int index) const { return field(index)->access_flags(); }
339 Symbol* field_name (int index) const { return field(index)->name(constants()); } 339 Symbol* field_name (int index) const { return field(index)->name(constants()); }
340 Symbol* field_signature (int index) const { return field(index)->signature(constants()); } 340 Symbol* field_signature (int index) const { return field(index)->signature(constants()); }
341 341
342 // Number of Java declared fields 342 // Number of Java declared fields
343 int java_fields_count() const { return _java_fields_count; } 343 int java_fields_count() const { return (int)_java_fields_count; }
344 344
345 // Number of fields including any injected fields 345 // Number of fields including any injected fields
346 int all_fields_count() const { return _fields->length() / sizeof(FieldInfo::field_slots); } 346 int all_fields_count() const { return _fields->length() / sizeof(FieldInfo::field_slots); }
347 347
348 typeArrayOop fields() const { return _fields; } 348 typeArrayOop fields() const { return _fields; }
349 349
350 void set_fields(typeArrayOop f, int java_fields_count) { 350 void set_fields(typeArrayOop f, u2 java_fields_count) {
351 oop_store_without_check((oop*) &_fields, (oop) f); 351 oop_store_without_check((oop*) &_fields, (oop) f);
352 _java_fields_count = java_fields_count; 352 _java_fields_count = java_fields_count;
353 } 353 }
354 354
355 // inner classes 355 // inner classes