graal-jvmci-8: src/share/vm/prims/jvmtiRedefineClasses.cpp comparison

comparison src/share/vm/prims/jvmtiRedefineClasses.cpp @ 10268:43083e670adf

8005056: NPG: Crash after redefining java.lang.Object Summary: Need to walk array class vtables replacing old methods too if j.l.o redefined Reviewed-by: sspitsyn, dcubed, ctornqvi

author	coleenp
date	Mon, 13 May 2013 15:37:08 -0400
parents	712a1e9c91f3
children	e7d29a019a3c

comparison

equal deleted inserted replaced

-:8b40495b9381
+:43083e670adf
 // 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);
+CheckClass check_class(thread);
+ClassLoaderDataGraph::classes_do(&check_class);
 #ifdef PRODUCT
 }
 #endif
 }
 rewrite_cp_refs_in_stack_map_table(method, THREAD);
 } // end for each method
 } // end set_new_constant_pool()
-void VM_RedefineClasses::adjust_array_vtable(Klass* k_oop) {
-ArrayKlass* ak = ArrayKlass::cast(k_oop);
-bool trace_name_printed = false;
-ak->vtable()->adjust_method_entries(_matching_old_methods,
-_matching_new_methods,
-_matching_methods_length,
-&trace_name_printed);
-}
 // Unevolving classes may point to methods of the_class directly
 // from their constant pool caches, itables, and/or vtables. We
-// use the SystemDictionary::classes_do() facility and this helper
+// use the ClassLoaderDataGraph::classes_do() facility and this helper
 // to fix up these pointers.
-//
-// Note: We currently don't support updating the vtable in
+// Adjust cpools and vtables closure
-// arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp.
+void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) {
-void VM_RedefineClasses::adjust_cpool_cache_and_vtable(Klass* k_oop,
-ClassLoaderData* initiating_loader,
+// This is a very busy routine. We don't want too much tracing
-TRAPS) {
+// printed out.
-Klass *k = k_oop;
+bool trace_name_printed = false;
-if (k->oop_is_instance()) {
-HandleMark hm(THREAD);
+// Very noisy: only enable this call if you are trying to determine
-InstanceKlass *ik = (InstanceKlass *) k;
+// that a specific class gets found by this routine.
+// RC_TRACE macro has an embedded ResourceMark
+// RC_TRACE_WITH_THREAD(0x00100000, THREAD,
+//   ("adjust check: name=%s", k->external_name()));
+// trace_name_printed = true;
+// If the class being redefined is java.lang.Object, we need to fix all
+// array class vtables also
+if (k->oop_is_array() && _the_class_oop == SystemDictionary::Object_klass()) {
+k->vtable()->adjust_method_entries(_matching_old_methods,
+_matching_new_methods,
+_matching_methods_length,
+&trace_name_printed);
+} else if (k->oop_is_instance()) {
+HandleMark hm(_thread);
+InstanceKlass *ik = InstanceKlass::cast(k);
 // HotSpot specific optimization! HotSpot does not currently
 // support delegation from the bootstrap class loader to a
 // user-defined class loader. This means that if the bootstrap
 // class loader is the initiating class loader, then it will also
 InstanceKlass::cast(_the_class_oop)->class_loader() != NULL;
 if (is_user_defined && ik->class_loader() == NULL) {
 return;
 }
-// If the class being redefined is java.lang.Object, we need to fix all
-// array class vtables also
-if (_the_class_oop == SystemDictionary::Object_klass()) {
-ik->array_klasses_do(adjust_array_vtable);
-}
-// This is a very busy routine. We don't want too much tracing
-// printed out.
-bool trace_name_printed = false;
-// Very noisy: only enable this call if you are trying to determine
-// that a specific class gets found by this routine.
-// RC_TRACE macro has an embedded ResourceMark
-// RC_TRACE_WITH_THREAD(0x00100000, THREAD,
-//   ("adjust check: name=%s", ik->external_name()));
-// trace_name_printed = true;
 // Fix the vtable embedded in the_class and subclasses of the_class,
 // if one exists. We discard scratch_class and we don't keep an
 // InstanceKlass around to hold obsolete methods so we don't have
 // any other InstanceKlass embedded vtables to update. The vtable
 // holds the Method*s for virtual (but not final) methods.
 if (ik->vtable_length() > 0 && ik->is_subtype_of(_the_class_oop)) {
 // ik->vtable() creates a wrapper object; rm cleans it up
-ResourceMark rm(THREAD);
+ResourceMark rm(_thread);
 ik->vtable()->adjust_method_entries(_matching_old_methods,
 _matching_new_methods,
 _matching_methods_length,
 &trace_name_printed);
 }
 // every InstanceKlass that has an itable since there isn't a
 // subclass relationship between an interface and an InstanceKlass.
 if (ik->itable_length() > 0 && (_the_class_oop->is_interface()
 || ik->is_subclass_of(_the_class_oop))) {
 // ik->itable() creates a wrapper object; rm cleans it up
-ResourceMark rm(THREAD);
+ResourceMark rm(_thread);
 ik->itable()->adjust_method_entries(_matching_old_methods,
 _matching_new_methods,
 _matching_methods_length,
 &trace_name_printed);
 }
 // updated. We can simply start with the previous version(s) in
 // that case.
 constantPoolHandle other_cp;
 ConstantPoolCache* cp_cache;
-if (k_oop != _the_class_oop) {
+if (ik != _the_class_oop) {
 // this klass' constant pool cache may need adjustment
 other_cp = constantPoolHandle(ik->constants());
 cp_cache = other_cp->cache();
 if (cp_cache != NULL) {
 cp_cache->adjust_method_entries(_matching_old_methods,
 _matching_methods_length,
 &trace_name_printed);
 }
 }
 {
-ResourceMark rm(THREAD);
+ResourceMark rm(_thread);
 // PreviousVersionInfo objects returned via PreviousVersionWalker
 // contain a GrowableArray of handles. We have to clean up the
 // GrowableArray _after_ the PreviousVersionWalker destructor
 // has destroyed the handles.
 {
 //    - replacing parts in the_class with parts from scratch_class
 //    - adding a weak reference to track the obsolete but interesting
 //      parts of the_class
 //    - adjusting constant pool caches and vtables in other classes
 //      that refer to methods in the_class. These adjustments use the
-//      SystemDictionary::classes_do() facility which only allows
+//      ClassLoaderDataGraph::classes_do() facility which only allows
 //      a helper method to be specified. The interesting parameters
 //      that we would like to pass to the helper method are saved in
 //      static global fields in the VM operation.
 void VM_RedefineClasses::redefine_single_class(jclass the_jclass,
 Klass* scratch_class_oop, TRAPS) {
 RC_TIMER_STOP(_timer_rsc_phase1);
 RC_TIMER_START(_timer_rsc_phase2);
 // Adjust constantpool caches and vtables for all classes
 // that reference methods of the evolved class.
-SystemDictionary::classes_do(adjust_cpool_cache_and_vtable, THREAD);
+AdjustCpoolCacheAndVtable adjust_cpool_cache_and_vtable(THREAD);
+ClassLoaderDataGraph::classes_do(&adjust_cpool_cache_and_vtable);
 // JSR-292 support
 MemberNameTable* mnt = the_class->member_names();
 if (mnt != NULL) {
 bool trace_name_printed = false;
 increment_class_counter(subik, THREAD);
 }
 }
 }
-void VM_RedefineClasses::check_class(Klass* k_oop,
+void VM_RedefineClasses::CheckClass::do_klass(Klass* k) {
-ClassLoaderData* initiating_loader,
+bool no_old_methods = true;  // be optimistic
-TRAPS) {
-Klass *k = k_oop;
+// Both array and instance classes have vtables.
+// a vtable should never contain old or obsolete methods
+ResourceMark rm(_thread);
+if (k->vtable_length() > 0 &&
+!k->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",
+k->signature_name()));
+k->vtable()->dump_vtable();
+}
+no_old_methods = false;
+}
 if (k->oop_is_instance()) {
-HandleMark hm(THREAD);
+HandleMark hm(_thread);
-InstanceKlass *ik = (InstanceKlass *) k;
+InstanceKlass *ik = InstanceKlass::cast(k);
-bool no_old_methods = true;  // be optimistic
-ResourceMark rm(THREAD);
-// a vtable should never contain old or obsolete methods
-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();
-}
-no_old_methods = false;
-}
 // an itable should never contain old or obsolete methods
 if (ik->itable_length() > 0 &&
 !ik->itable()->check_no_old_or_obsolete_entries()) {
 if (RC_TRACE_ENABLED(0x00004000)) {
-RC_TRACE_WITH_THREAD(0x00004000, THREAD,
+RC_TRACE_WITH_THREAD(0x00004000, _thread,
 ("klassItable::check_no_old_or_obsolete_entries failure"
 " -- OLD or OBSOLETE method found -- class: %s",
 ik->signature_name()));
 ik->itable()->dump_itable();
 }
 // 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_or_obsolete_entries()) {
 if (RC_TRACE_ENABLED(0x00004000)) {
-RC_TRACE_WITH_THREAD(0x00004000, THREAD,
+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)) {
+// print and fail guarantee if old methods are found.
-dump_methods();
+if (!no_old_methods) {
-} else {
+if (RC_TRACE_ENABLED(0x00004000)) {
-tty->print_cr("INFO: use the '-XX:TraceRedefineClasses=16384' option "
+dump_methods();
-"to see more info about the following guarantee() failure.");
+} else {
-}
+tty->print_cr("INFO: use the '-XX:TraceRedefineClasses=16384' option "
-guarantee(false, "OLD and/or OBSOLETE method(s) found");
+"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;
 RC_TRACE(0x00004000, ("_old_methods --"));
 for (j = 0; j < _old_methods->length(); ++j) {

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/prims/jvmtiRedefineClasses.cpp @ 10268:43083e670adf