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

comparison src/share/vm/prims/jvmtiRedefineClasses.cpp @ 22886:fdde6a70ea85

8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale Summary: optimize the adjust_method_entries functions by using the orig_method_idnum() function Reviewed-by: coleenp, dcubed

author	sspitsyn
date	Tue, 17 Mar 2015 17:11:14 -0700
parents	367427923e39
children	5b2cd065dfc6

comparison

equal deleted inserted replaced

-:367427923e39
+:fdde6a70ea85
 u2 old_num = k_old_method->method_idnum();
 if (new_num != old_num) {
 Method* idnum_owner = scratch_class->method_with_idnum(old_num);
 if (idnum_owner != NULL) {
 // There is already a method assigned this idnum -- switch them
+// Take current and original idnum from the new_method
 idnum_owner->set_method_idnum(new_num);
+idnum_owner->set_orig_method_idnum(k_new_method->orig_method_idnum());
 }
+// Take current and original idnum from the old_method
 k_new_method->set_method_idnum(old_num);
+k_new_method->set_orig_method_idnum(k_old_method->orig_method_idnum());
 if (thread->has_pending_exception()) {
 return JVMTI_ERROR_OUT_OF_MEMORY;
 }
 }
 }
 }
 u2 new_num = k_new_method->method_idnum();
 Method* idnum_owner = scratch_class->method_with_idnum(num);
 if (idnum_owner != NULL) {
 // There is already a method assigned this idnum -- switch them
+// Take current and original idnum from the new_method
 idnum_owner->set_method_idnum(new_num);
+idnum_owner->set_orig_method_idnum(k_new_method->orig_method_idnum());
 }
 k_new_method->set_method_idnum(num);
+k_new_method->set_orig_method_idnum(num);
 if (thread->has_pending_exception()) {
 return JVMTI_ERROR_OUT_OF_MEMORY;
 }
 }
 RC_TRACE(0x00008000, ("Method added: new: %s [%d]",
 void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) {
 // This is a very busy routine. We don't want too much tracing
 // printed out.
 bool trace_name_printed = false;
+InstanceKlass *the_class = InstanceKlass::cast(_the_class_oop);
 // 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,
 // 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,
+k->vtable()->adjust_method_entries(the_class, &trace_name_printed);
-_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
 // default_vtable_indices for methods already in the vtable.
 if (ik->vtable_length() > 0 && (_the_class_oop->is_interface()
 || ik->is_subtype_of(_the_class_oop))) {
 // ik->vtable() creates a wrapper object; rm cleans it up
 ResourceMark rm(_thread);
-ik->vtable()->adjust_method_entries(_matching_old_methods,
-_matching_new_methods,
+ik->vtable()->adjust_method_entries(the_class, &trace_name_printed);
-_matching_methods_length,
+ik->adjust_default_methods(the_class, &trace_name_printed);
-&trace_name_printed);
-ik->adjust_default_methods(_matching_old_methods,
-_matching_new_methods,
-_matching_methods_length,
-&trace_name_printed);
 }
 // If the current class has an itable and we are either redefining an
 // interface or if the current class is a subclass of the_class, then
 // we potentially have to fix the itable. If we are redefining an
 // 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);
-ik->itable()->adjust_method_entries(_matching_old_methods,
-_matching_new_methods,
+ik->itable()->adjust_method_entries(the_class, &trace_name_printed);
-_matching_methods_length,
-&trace_name_printed);
 }
 // The constant pools in other classes (other_cp) can refer to
 // methods in the_class. We have to update method information in
 // other_cp's cache. If other_cp has a previous version, then we
 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,
+cp_cache->adjust_method_entries(the_class, &trace_name_printed);
-_matching_new_methods,
-_matching_methods_length,
-&trace_name_printed);
 }
 }
 // the previous versions' constant pool caches may need adjustment
 PreviousVersionWalker pvw(_thread, ik);
 old_method->set_is_obsolete();
 obsolete_count++;
 // obsolete methods need a unique idnum so they become new entries in
 // the jmethodID cache in InstanceKlass
+assert(old_method->method_idnum() == new_method->method_idnum(), "must match");
 u2 num = InstanceKlass::cast(_the_class_oop)->next_method_idnum();
 if (num != ConstMethod::UNSET_IDNUM) {
 old_method->set_method_idnum(num);
 }

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/prims/jvmtiRedefineClasses.cpp @ 22886:fdde6a70ea85