1.1 --- a/src/share/vm/oops/constantPool.hpp Thu Oct 04 14:55:57 2012 +0200 1.2 +++ b/src/share/vm/oops/constantPool.hpp Tue Nov 06 15:09:37 2012 -0500 1.3 @@ -86,8 +86,8 @@ 1.4 friend class Universe; // For null constructor 1.5 private: 1.6 Array<u1>* _tags; // the tag array describing the constant pool's contents 1.7 - ConstantPoolCache* _cache; // the cache holding interpreter runtime information 1.8 - Klass* _pool_holder; // the corresponding class 1.9 + ConstantPoolCache* _cache; // the cache holding interpreter runtime information 1.10 + InstanceKlass* _pool_holder; // the corresponding class 1.11 Array<u2>* _operands; // for variable-sized (InvokeDynamic) nodes, usually empty 1.12 1.13 // Array of resolved objects from the constant pool and map from resolved 1.14 @@ -193,9 +193,9 @@ 1.15 void set_on_stack(const bool value); 1.16 1.17 // Klass holding pool 1.18 - Klass* pool_holder() const { return _pool_holder; } 1.19 - void set_pool_holder(Klass* k) { _pool_holder = k; } 1.20 - Klass** pool_holder_addr() { return &_pool_holder; } 1.21 + InstanceKlass* pool_holder() const { return _pool_holder; } 1.22 + void set_pool_holder(InstanceKlass* k) { _pool_holder = k; } 1.23 + InstanceKlass** pool_holder_addr() { return &_pool_holder; } 1.24 1.25 // Interpreter runtime support 1.26 ConstantPoolCache* cache() const { return _cache; }