comparison src/share/vm/oops/constantPool.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 6e5a59a8e4a7
children e522a00b91aa b14da2e6f2dc
comparison
equal deleted inserted replaced
6939:c284cf4781f0 6940:18fb7da42534
84 friend class VMStructs; 84 friend class VMStructs;
85 friend class BytecodeInterpreter; // Directly extracts an oop in the pool for fast instanceof/checkcast 85 friend class BytecodeInterpreter; // Directly extracts an oop in the pool for fast instanceof/checkcast
86 friend class Universe; // For null constructor 86 friend class Universe; // For null constructor
87 private: 87 private:
88 Array<u1>* _tags; // the tag array describing the constant pool's contents 88 Array<u1>* _tags; // the tag array describing the constant pool's contents
89 ConstantPoolCache* _cache; // the cache holding interpreter runtime information 89 ConstantPoolCache* _cache; // the cache holding interpreter runtime information
90 Klass* _pool_holder; // the corresponding class 90 InstanceKlass* _pool_holder; // the corresponding class
91 Array<u2>* _operands; // for variable-sized (InvokeDynamic) nodes, usually empty 91 Array<u2>* _operands; // for variable-sized (InvokeDynamic) nodes, usually empty
92 92
93 // Array of resolved objects from the constant pool and map from resolved 93 // Array of resolved objects from the constant pool and map from resolved
94 // object index to original constant pool index 94 // object index to original constant pool index
95 jobject _resolved_references; 95 jobject _resolved_references;
191 // class. 191 // class.
192 bool on_stack() const { return _on_stack; } 192 bool on_stack() const { return _on_stack; }
193 void set_on_stack(const bool value); 193 void set_on_stack(const bool value);
194 194
195 // Klass holding pool 195 // Klass holding pool
196 Klass* pool_holder() const { return _pool_holder; } 196 InstanceKlass* pool_holder() const { return _pool_holder; }
197 void set_pool_holder(Klass* k) { _pool_holder = k; } 197 void set_pool_holder(InstanceKlass* k) { _pool_holder = k; }
198 Klass** pool_holder_addr() { return &_pool_holder; } 198 InstanceKlass** pool_holder_addr() { return &_pool_holder; }
199 199
200 // Interpreter runtime support 200 // Interpreter runtime support
201 ConstantPoolCache* cache() const { return _cache; } 201 ConstantPoolCache* cache() const { return _cache; }
202 void set_cache(ConstantPoolCache* cache){ _cache = cache; } 202 void set_cache(ConstantPoolCache* cache){ _cache = cache; }
203 203