Mercurial > hg > truffle

comparison src/share/vm/oops/constantPool.cpp @ 6840:6e5a59a8e4a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author rbackman
date Tue, 09 Oct 2012 07:41:27 +0200
parents f6b0eb4e44cf d8ce2825b193
children 4735d2c84362
comparison
equal deleted inserted replaced
6830:81e878c53615 6840:6e5a59a8e4a7
531 531
532 532
533 void ConstantPool::verify_constant_pool_resolve(constantPoolHandle this_oop, KlassHandle k, TRAPS) { 533 void ConstantPool::verify_constant_pool_resolve(constantPoolHandle this_oop, KlassHandle k, TRAPS) {
534 if (k->oop_is_instance() || k->oop_is_objArray()) { 534 if (k->oop_is_instance() || k->oop_is_objArray()) {
535 instanceKlassHandle holder (THREAD, this_oop->pool_holder()); 535 instanceKlassHandle holder (THREAD, this_oop->pool_holder());
536 Klass* elem_oop = k->oop_is_instance() ? k() : objArrayKlass::cast(k())->bottom_klass(); 536 Klass* elem_oop = k->oop_is_instance() ? k() : ObjArrayKlass::cast(k())->bottom_klass();
537 KlassHandle element (THREAD, elem_oop); 537 KlassHandle element (THREAD, elem_oop);
538 538
539 // The element type could be a typeArray - we only need the access check if it is 539 // The element type could be a typeArray - we only need the access check if it is
540 // an reference to another class 540 // an reference to another class
541 if (element->oop_is_instance()) { 541 if (element->oop_is_instance()) {