jdk-sandbox: comparison hotspot/src/share/vm/oops/constantPool.cpp

equal deleted inserted replaced

-:bd0d881cf1c5
+:df0a1573d5bd
 if (this_oop->tag_at(which).is_unresolved_klass_in_error()) {
 in_error = true;
 } else {
 do_resolve = true;
 name   = this_oop->unresolved_klass_at(which);
-loader = Handle(THREAD, InstanceKlass::cast(this_oop->pool_holder())->class_loader());
+loader = Handle(THREAD, this_oop->pool_holder()->class_loader());
 }
 }
 } // unlocking constantPool
 THROW_MSG_0(error, className);
 }
 if (do_resolve) {
 // this_oop must be unlocked during resolve_or_fail
-oop protection_domain = Klass::cast(this_oop->pool_holder())->protection_domain();
+oop protection_domain = this_oop->pool_holder()->protection_domain();
 Handle h_prot (THREAD, protection_domain);
 Klass* k_oop = SystemDictionary::resolve_or_fail(name, loader, h_prot, true, THREAD);
 KlassHandle k;
 if (!HAS_PENDING_EXCEPTION) {
 k = KlassHandle(THREAD, k_oop);
 if (JavaThread::current()->has_last_Java_frame()) {
 // try to identify the method which called this function.
 vframeStream vfst(JavaThread::current());
 if (!vfst.at_end()) {
 line_number = vfst.method()->line_number_from_bci(vfst.bci());
-Symbol* s = InstanceKlass::cast(vfst.method()->method_holder())->source_file_name();
+Symbol* s = vfst.method()->method_holder()->source_file_name();
 if (s != NULL) {
 source_file = s->as_C_string();
 }
 }
 }
 if (k() != this_oop->pool_holder()) {
 // only print something if the classes are different
 if (source_file != NULL) {
 tty->print("RESOLVE %s %s %s:%d\n",
-InstanceKlass::cast(this_oop->pool_holder())->external_name(),
+this_oop->pool_holder()->external_name(),
 InstanceKlass::cast(k())->external_name(), source_file, line_number);
 } else {
 tty->print("RESOLVE %s %s\n",
-InstanceKlass::cast(this_oop->pool_holder())->external_name(),
+this_oop->pool_holder()->external_name(),
 InstanceKlass::cast(k())->external_name());
 }
 }
 return k();
 } else {
 MonitorLockerEx ml(this_oop->lock());
 // Only updated constant pool - if it is resolved.
 do_resolve = this_oop->tag_at(which).is_unresolved_klass();
 if (do_resolve) {
-ClassLoaderData* this_key = InstanceKlass::cast(this_oop->pool_holder())->class_loader_data();
+ClassLoaderData* this_key = this_oop->pool_holder()->class_loader_data();
 if (!this_key->is_the_null_class_loader_data()) {
 this_key->record_dependency(k(), CHECK_NULL); // Can throw OOM
 }
 this_oop->klass_at_put(which, k());
 }
 return entry.get_klass();
 } else {
 assert(entry.is_unresolved(), "must be either symbol or klass");
 Thread *thread = Thread::current();
 Symbol* name = entry.get_symbol();
-oop loader = InstanceKlass::cast(this_oop->pool_holder())->class_loader();
+oop loader = this_oop->pool_holder()->class_loader();
-oop protection_domain = Klass::cast(this_oop->pool_holder())->protection_domain();
+oop protection_domain = this_oop->pool_holder()->protection_domain();
 Handle h_prot (thread, protection_domain);
 Handle h_loader (thread, loader);
 Klass* k = SystemDictionary::find(name, h_loader, h_prot, thread);
 if (k != NULL) {
 assert(entry.get_klass()->is_klass(), "must be");
 return entry.get_klass();
 } else {
 assert(entry.is_unresolved(), "must be either symbol or klass");
 Symbol*  name  = entry.get_symbol();
-oop loader = InstanceKlass::cast(this_oop->pool_holder())->class_loader();
+oop loader = this_oop->pool_holder()->class_loader();
-oop protection_domain = Klass::cast(this_oop->pool_holder())->protection_domain();
+oop protection_domain = this_oop->pool_holder()->protection_domain();
 Handle h_loader(THREAD, loader);
 Handle h_prot  (THREAD, protection_domain);
 KlassHandle k(THREAD, SystemDictionary::find(name, h_loader, h_prot, THREAD));
 // Do access check for klasses
 // Ensure that all the patches have been used.
 for (int index = 0; index < cp_patches->length(); index++) {
 assert(cp_patches->at(index).is_null(),
 err_msg("Unused constant pool patch at %d in class file %s",
 index,
-InstanceKlass::cast(pool_holder())->external_name()));
+pool_holder()->external_name()));
 }
 #endif // ASSERT
 }
 #ifndef PRODUCT
 if (operands() != NULL)  st->print("/operands[%d]", operands()->length());
 print_address_on(st);
 st->print(" for ");
 pool_holder()->print_value_on(st);
 if (pool_holder() != NULL) {
-bool extra = (InstanceKlass::cast(pool_holder())->constants() != this);
+bool extra = (pool_holder()->constants() != this);
 if (extra)  st->print(" (extra)");
 }
 if (cache() != NULL) {
 st->print(" cache=" PTR_FORMAT, cache());
 }

changeset 14391	df0a1573d5bd
parent 14385	959bbcc16725
child 14588	8ec26d2d9339