jdk-sandbox: comparison hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp

equal deleted inserted replaced

-:7719efe7b23d
+:b8aa0577f137
 // Set flag indicating that some invariants are no longer true.
 // See jvmtiExport.hpp for detailed explanation.
 JvmtiExport::set_has_redefined_a_class();
-#ifdef ASSERT
+// check_class() is optionally called for product bits, but is
-SystemDictionary::classes_do(check_class, thread);
+// always called for non-product bits.
+#ifdef PRODUCT
+if (RC_TRACE_ENABLED(0x00004000)) {
+#endif
+RC_TRACE_WITH_THREAD(0x00004000, thread, ("calling check_class"));
+SystemDictionary::classes_do(check_class, thread);
+#ifdef PRODUCT
+}
 #endif
 }
 void VM_RedefineClasses::doit_epilogue() {
 // Free os::malloc allocated memory.
 RC_TRACE_WITH_THREAD(0x00080000, THREAD,
 ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c),
 bcp, cp_index, new_index));
 // Rewriter::rewrite_method() uses put_native_u2() in this
 // situation because it is reusing the constant pool index
-// location for a native index into the constantPoolCache.
+// location for a native index into the ConstantPoolCache.
 // Since we are updating the constant pool index prior to
-// verification and constantPoolCache initialization, we
+// verification and ConstantPoolCache initialization, we
 // need to keep the new index in Java byte order.
 Bytes::put_Java_u2(p, new_index);
 }
 } break;
 }
 increment_class_counter(subik, THREAD);
 }
 }
 }
-#ifndef PRODUCT
 void VM_RedefineClasses::check_class(Klass* k_oop,
 ClassLoaderData* initiating_loader,
 TRAPS) {
 Klass *k = k_oop;
 if (k->oop_is_instance()) {
 HandleMark hm(THREAD);
 InstanceKlass *ik = (InstanceKlass *) k;
+bool no_old_methods = true;  // be optimistic
-if (ik->vtable_length() > 0) {
+ResourceMark rm(THREAD);
-ResourceMark rm(THREAD);
-if (!ik->vtable()->check_no_old_entries()) {
+// a vtable should never contain old or obsolete methods
-tty->print_cr("klassVtable::check_no_old_entries failure -- OLD method found -- class: %s", ik->signature_name());
+if (ik->vtable_length() > 0 &&
+!ik->vtable()->check_no_old_or_obsolete_entries()) {
+if (RC_TRACE_ENABLED(0x00004000)) {
+RC_TRACE_WITH_THREAD(0x00004000, THREAD,
+("klassVtable::check_no_old_or_obsolete_entries failure"
+" -- OLD or OBSOLETE method found -- class: %s",
+ik->signature_name()));
 ik->vtable()->dump_vtable();
-assert(false, "OLD method found");
+}
-}
+no_old_methods = false;
 }
-if (ik->itable_length() > 0) {
-ResourceMark rm(THREAD);
+// an itable should never contain old or obsolete methods
-if (!ik->itable()->check_no_old_entries()) {
+if (ik->itable_length() > 0 &&
-tty->print_cr("klassItable::check_no_old_entries failure -- OLD method found -- class: %s", ik->signature_name());
+!ik->itable()->check_no_old_or_obsolete_entries()) {
-assert(false, "OLD method found");
+if (RC_TRACE_ENABLED(0x00004000)) {
-}
+RC_TRACE_WITH_THREAD(0x00004000, THREAD,
-}
+("klassItable::check_no_old_or_obsolete_entries failure"
-// Check that the constant pool cache has no deleted entries.
+" -- OLD or OBSOLETE method found -- class: %s",
+ik->signature_name()));
+ik->itable()->dump_itable();
+}
+no_old_methods = false;
+}
+// the constant pool cache should never contain old or obsolete methods
 if (ik->constants() != NULL &&
 ik->constants()->cache() != NULL &&
-!ik->constants()->cache()->check_no_old_entries()) {
+!ik->constants()->cache()->check_no_old_or_obsolete_entries()) {
-tty->print_cr("klassVtable::check_no_old_entries failure -- OLD method found -- class: %s", ik->signature_name());
+if (RC_TRACE_ENABLED(0x00004000)) {
-assert(false, "OLD method found");
+RC_TRACE_WITH_THREAD(0x00004000, THREAD,
+("cp-cache::check_no_old_or_obsolete_entries failure"
+" -- OLD or OBSOLETE method found -- class: %s",
+ik->signature_name()));
+ik->constants()->cache()->dump_cache();
+}
+no_old_methods = false;
+}
+if (!no_old_methods) {
+if (RC_TRACE_ENABLED(0x00004000)) {
+dump_methods();
+} else {
+tty->print_cr("INFO: use the '-XX:TraceRedefineClasses=16384' option "
+"to see more info about the following guarantee() failure.");
+}
+guarantee(false, "OLD and/or OBSOLETE method(s) found");
 }
 }
 }
 void VM_RedefineClasses::dump_methods() {
 int j;
-tty->print_cr("_old_methods --");
+RC_TRACE(0x00004000, ("_old_methods --"));
 for (j = 0; j < _old_methods->length(); ++j) {
 Method* m = _old_methods->at(j);
-tty->print("%4d  (%5d)  ", j, m->vtable_index());
+RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
 m->access_flags().print_on(tty);
 tty->print(" --  ");
 m->print_name(tty);
 tty->cr();
 }
-tty->print_cr("_new_methods --");
+RC_TRACE(0x00004000, ("_new_methods --"));
 for (j = 0; j < _new_methods->length(); ++j) {
 Method* m = _new_methods->at(j);
-tty->print("%4d  (%5d)  ", j, m->vtable_index());
+RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
 m->access_flags().print_on(tty);
 tty->print(" --  ");
 m->print_name(tty);
 tty->cr();
 }
-tty->print_cr("_matching_(old/new)_methods --");
+RC_TRACE(0x00004000, ("_matching_(old/new)_methods --"));
 for (j = 0; j < _matching_methods_length; ++j) {
 Method* m = _matching_old_methods[j];
-tty->print("%4d  (%5d)  ", j, m->vtable_index());
+RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
 m->access_flags().print_on(tty);
 tty->print(" --  ");
 m->print_name(tty);
 tty->cr();
 m = _matching_new_methods[j];
-tty->print("      (%5d)  ", m->vtable_index());
+RC_TRACE_NO_CR(0x00004000, ("      (%5d)  ", m->vtable_index()));
 m->access_flags().print_on(tty);
 tty->cr();
 }
-tty->print_cr("_deleted_methods --");
+RC_TRACE(0x00004000, ("_deleted_methods --"));
 for (j = 0; j < _deleted_methods_length; ++j) {
 Method* m = _deleted_methods[j];
-tty->print("%4d  (%5d)  ", j, m->vtable_index());
+RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
 m->access_flags().print_on(tty);
 tty->print(" --  ");
 m->print_name(tty);
 tty->cr();
 }
-tty->print_cr("_added_methods --");
+RC_TRACE(0x00004000, ("_added_methods --"));
 for (j = 0; j < _added_methods_length; ++j) {
 Method* m = _added_methods[j];
-tty->print("%4d  (%5d)  ", j, m->vtable_index());
+RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
 m->access_flags().print_on(tty);
 tty->print(" --  ");
 m->print_name(tty);
 tty->cr();
 }
 }
-#endif

changeset 15591	b8aa0577f137
parent 15446	5ea56212959f
child 15601	df8faef6efaf