stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8262280: Incorrect exception handling for VMThread in class redefinition

Browse Source 
Reviewed-by: hseigel
This commit is contained in:
Coleen Phillimore 2021-04-02 13:05:15 +00:00
parent 7d0a0bad7f
commit 885916eda0
2 changed files with 19 additions and 19 deletions

32
src/hotspot/share/prims/jvmtiRedefineClasses.cpp

@ -236,7 +236,7 @@ bool VM_RedefineClasses::doit_prologue() {
}
void VM_RedefineClasses::doit() {
Thread *thread = Thread::current();
Thread* current = Thread::current();
#if INCLUDE_CDS
if (UseSharedSpaces) {
@ -255,11 +255,11 @@ void VM_RedefineClasses::doit() {
// Mark methods seen on stack and everywhere else so old methods are not
// cleaned up if they're on the stack.
MetadataOnStackMark md_on_stack(/*walk_all_metadata*/true, /*redefinition_walk*/true);
HandleMark hm(thread); // make sure any handles created are deleted
// before the stack walk again.
HandleMark hm(current); // make sure any handles created are deleted
// before the stack walk again.
for (int i = 0; i < _class_count; i++) {
redefine_single_class(_class_defs[i].klass, _scratch_classes[i], thread);
redefine_single_class(current, _class_defs[i].klass, _scratch_classes[i]);
}
// Flush all compiled code that depends on the classes redefined.
@ -269,7 +269,7 @@ void VM_RedefineClasses::doit() {
// that reference methods of the evolved classes.
// Have to do this after all classes are redefined and all methods that
// are redefined are marked as old.
AdjustAndCleanMetadata adjust_and_clean_metadata(thread);
AdjustAndCleanMetadata adjust_and_clean_metadata(current);
ClassLoaderDataGraph::classes_do(&adjust_and_clean_metadata);
// JSR-292 support
@ -288,7 +288,7 @@ void VM_RedefineClasses::doit() {
if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
#endif
log_trace(redefine, class, obsolete, metadata)("calling check_class");
CheckClass check_class(thread);
CheckClass check_class(current);
ClassLoaderDataGraph::classes_do(&check_class);
#ifdef PRODUCT
}
@ -3784,14 +3784,14 @@ void VM_RedefineClasses::AdjustAndCleanMetadata::do_klass(Klass* k) {
}
}
void VM_RedefineClasses::update_jmethod_ids(Thread* thread) {
void VM_RedefineClasses::update_jmethod_ids() {
for (int j = 0; j < _matching_methods_length; ++j) {
Method* old_method = _matching_old_methods[j];
jmethodID jmid = old_method->find_jmethod_id_or_null();
if (jmid != NULL) {
// There is a jmethodID, change it to point to the new method
methodHandle new_method_h(thread, _matching_new_methods[j]);
Method::change_method_associated_with_jmethod_id(jmid, new_method_h());
Method* new_method = _matching_new_methods[j];
Method::change_method_associated_with_jmethod_id(jmid, new_method);
assert(Method::resolve_jmethod_id(jmid) == _matching_new_methods[j],
"should be replaced");
}
@ -4203,10 +4203,10 @@ void VM_RedefineClasses::swap_annotations(InstanceKlass* the_class,
// 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,
InstanceKlass* scratch_class, TRAPS) {
void VM_RedefineClasses::redefine_single_class(Thread* current, jclass the_jclass,
InstanceKlass* scratch_class) {
HandleMark hm(THREAD); // make sure handles from this call are freed
HandleMark hm(current); // make sure handles from this call are freed
if (log_is_enabled(Info, redefine, class, timer)) {
_timer_rsc_phase1.start();
@ -4228,7 +4228,7 @@ void VM_RedefineClasses::redefine_single_class(jclass the_jclass,
_new_methods = scratch_class->methods();
_the_class = the_class;
compute_added_deleted_matching_methods();
update_jmethod_ids(THREAD);
update_jmethod_ids();
_any_class_has_resolved_methods = the_class->has_resolved_methods() || _any_class_has_resolved_methods;
@ -4416,7 +4416,7 @@ void VM_RedefineClasses::redefine_single_class(jclass the_jclass,
if (!the_class->should_be_initialized()) {
// Class was already initialized, so AOT has only seen the original version.
// We need to let AOT look at it again.
AOTLoader::load_for_klass(the_class, THREAD);
AOTLoader::load_for_klass(the_class, current);
}
// keep track of previous versions of this class
@ -4444,13 +4444,13 @@ void VM_RedefineClasses::redefine_single_class(jclass the_jclass,
}
{
ResourceMark rm(THREAD);
ResourceMark rm(current);
// increment the classRedefinedCount field in the_class and in any
// direct and indirect subclasses of the_class
log_info(redefine, class, load)
("redefined name=%s, count=%d (avail_mem=" UINT64_FORMAT "K)",
the_class->external_name(), java_lang_Class::classRedefinedCount(the_class->java_mirror()), os::available_memory() >> 10);
Events::log_redefinition(THREAD, "redefined class name=%s, count=%d",
Events::log_redefinition(current, "redefined class name=%s, count=%d",
the_class->external_name(),
java_lang_Class::classRedefinedCount(the_class->java_mirror()));

6
src/hotspot/share/prims/jvmtiRedefineClasses.hpp

@ -407,7 +407,7 @@ class VM_RedefineClasses: public VM_Operation {
void compute_added_deleted_matching_methods();
// Change jmethodIDs to point to the new methods
void update_jmethod_ids(Thread* thread);
void update_jmethod_ids();
// In addition to marking methods as old and/or obsolete, this routine
// counts the number of methods that are EMCP (Equivalent Module Constant Pool).
@ -415,8 +415,8 @@ class VM_RedefineClasses: public VM_Operation {
void transfer_old_native_function_registrations(InstanceKlass* the_class);
// Install the redefinition of a class
void redefine_single_class(jclass the_jclass,
InstanceKlass* scratch_class_oop, TRAPS);
void redefine_single_class(Thread* current, jclass the_jclass,
InstanceKlass* scratch_class_oop);
void swap_annotations(InstanceKlass* new_class,
InstanceKlass* scratch_class);