comparison src/share/vm/runtime/fieldDescriptor.hpp @ 6940:18fb7da42534

8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass Summary: Change types of above methods and field to InstanceKlass and remove unneeded casts from the source files. Reviewed-by: dholmes, coleenp, zgu Contributed-by: harold.seigel@oracle.com
author coleenp
date Tue, 06 Nov 2012 15:09:37 -0500
parents da91efe96a93
children e522a00b91aa 35431a769282
comparison
equal deleted inserted replaced
6939:c284cf4781f0 6940:18fb7da42534
41 int _index; // the field index 41 int _index; // the field index
42 constantPoolHandle _cp; 42 constantPoolHandle _cp;
43 43
44 // update the access_flags for the field in the klass 44 // update the access_flags for the field in the klass
45 void update_klass_field_access_flag() { 45 void update_klass_field_access_flag() {
46 InstanceKlass* ik = InstanceKlass::cast(field_holder()); 46 InstanceKlass* ik = field_holder();
47 ik->field(index())->set_access_flags(_access_flags.as_short()); 47 ik->field(index())->set_access_flags(_access_flags.as_short());
48 } 48 }
49 49
50 FieldInfo* field() const { 50 FieldInfo* field() const {
51 InstanceKlass* ik = InstanceKlass::cast(field_holder()); 51 InstanceKlass* ik = field_holder();
52 return ik->field(_index); 52 return ik->field(_index);
53 } 53 }
54 54
55 public: 55 public:
56 Symbol* name() const { 56 Symbol* name() const {
57 return field()->name(_cp); 57 return field()->name(_cp);
58 } 58 }
59 Symbol* signature() const { 59 Symbol* signature() const {
60 return field()->signature(_cp); 60 return field()->signature(_cp);
61 } 61 }
62 Klass* field_holder() const { return _cp->pool_holder(); } 62 InstanceKlass* field_holder() const { return _cp->pool_holder(); }
63 ConstantPool* constants() const { return _cp(); } 63 ConstantPool* constants() const { return _cp(); }
64 AccessFlags access_flags() const { return _access_flags; } 64 AccessFlags access_flags() const { return _access_flags; }
65 oop loader() const; 65 oop loader() const;
66 // Offset (in words) of field from start of instanceOop / Klass* 66 // Offset (in words) of field from start of instanceOop / Klass*
67 int offset() const { return field()->offset(); } 67 int offset() const { return field()->offset(); }
68 Symbol* generic_signature() const; 68 Symbol* generic_signature() const;
69 int index() const { return _index; } 69 int index() const { return _index; }
70 AnnotationArray* annotations() const; 70 AnnotationArray* annotations() const;
71 71
72 // Initial field value 72 // Initial field value
73 bool has_initial_value() const { return field()->initval_index() != 0; } 73 bool has_initial_value() const { return field()->initval_index() != 0; }
74 int initial_value_index() const { return field()->initval_index(); } 74 int initial_value_index() const { return field()->initval_index(); }
75 constantTag initial_value_tag() const; // The tag will return true on one of is_int(), is_long(), is_single(), is_double() 75 constantTag initial_value_tag() const; // The tag will return true on one of is_int(), is_long(), is_single(), is_double()
76 jint int_initial_value() const; 76 jint int_initial_value() const;
77 jlong long_initial_value() const; 77 jlong long_initial_value() const;
78 jfloat float_initial_value() const; 78 jfloat float_initial_value() const;
79 jdouble double_initial_value() const; 79 jdouble double_initial_value() const;
80 oop string_initial_value(TRAPS) const; 80 oop string_initial_value(TRAPS) const;
81 81
82 // Field signature type 82 // Field signature type
83 BasicType field_type() const { return FieldType::basic_type(signature()); } 83 BasicType field_type() const { return FieldType::basic_type(signature()); }
84 84
85 // Access flags 85 // Access flags
86 bool is_public() const { return access_flags().is_public(); } 86 bool is_public() const { return access_flags().is_public(); }
87 bool is_private() const { return access_flags().is_private(); } 87 bool is_private() const { return access_flags().is_private(); }
88 bool is_protected() const { return access_flags().is_protected(); } 88 bool is_protected() const { return access_flags().is_protected(); }
89 bool is_package_private() const { return !is_public() && !is_private() && !is_protected(); } 89 bool is_package_private() const { return !is_public() && !is_private() && !is_protected(); }
90 90
91 bool is_static() const { return access_flags().is_static(); } 91 bool is_static() const { return access_flags().is_static(); }
92 bool is_final() const { return access_flags().is_final(); } 92 bool is_final() const { return access_flags().is_final(); }
93 bool is_volatile() const { return access_flags().is_volatile(); } 93 bool is_volatile() const { return access_flags().is_volatile(); }
94 bool is_transient() const { return access_flags().is_transient(); } 94 bool is_transient() const { return access_flags().is_transient(); }
95 95
96 bool is_synthetic() const { return access_flags().is_synthetic(); } 96 bool is_synthetic() const { return access_flags().is_synthetic(); }
97 97
98 bool is_field_access_watched() const { return access_flags().is_field_access_watched(); } 98 bool is_field_access_watched() const { return access_flags().is_field_access_watched(); }
99 bool is_field_modification_watched() const 99 bool is_field_modification_watched() const
100 { return access_flags().is_field_modification_watched(); } 100 { return access_flags().is_field_modification_watched(); }
101 bool has_generic_signature() const { return access_flags().field_has_generic_signature(); } 101 bool has_generic_signature() const { return access_flags().field_has_generic_signature(); }
102 102
103 void set_is_field_access_watched(const bool value) { 103 void set_is_field_access_watched(const bool value) {
104 _access_flags.set_is_field_access_watched(value); 104 _access_flags.set_is_field_access_watched(value);
105 update_klass_field_access_flag(); 105 update_klass_field_access_flag();
106 } 106 }