archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8017230: Internal Error (jvmtiRedefineClasses.cpp:1662): guarantee(false) failed: insert_space_at() failed

Browse source 
Handle pending exceptions instead of firing a guarantee()

Reviewed-by: coleenp, dholmes
This commit is contained in:
Serguei Spitsyn 2013-09-13 12:46:40 -07:00 • committed by Serguei Spitsyn
parent 9e8f860fec
commit 5c11ecebfb
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
View file

@ -1590,11 +1590,23 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_methods(
for (int i = methods->length() - 1; i >= 0; i--) { for (int i = methods->length() - 1; i >= 0; i--) {
methodHandle method(THREAD, methods->at(i)); methodHandle method(THREAD, methods->at(i));
methodHandle new_method; methodHandle new_method;
rewrite_cp_refs_in_method(method, &new_method, CHECK_false); rewrite_cp_refs_in_method(method, &new_method, THREAD);
if (!new_method.is_null()) { if (!new_method.is_null()) {
// the method has been replaced so save the new method version // the method has been replaced so save the new method version
// even in the case of an exception. original method is on the
// deallocation list.
methods->at_put(i, new_method()); methods->at_put(i, new_method());
} }
if (HAS_PENDING_EXCEPTION) {
Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
// RC_TRACE_WITH_THREAD macro has an embedded ResourceMark
RC_TRACE_WITH_THREAD(0x00000002, THREAD,
("rewrite_cp_refs_in_method exception: '%s'", ex_name->as_C_string()));
// Need to clear pending exception here as the super caller sets
// the JVMTI_ERROR_INTERNAL if the returned value is false.
CLEAR_PENDING_EXCEPTION;
return false;
}
} }
return true; return true;
@ -1674,10 +1686,7 @@ void VM_RedefineClasses::rewrite_cp_refs_in_method(methodHandle method,
Pause_No_Safepoint_Verifier pnsv(&nsv); Pause_No_Safepoint_Verifier pnsv(&nsv);
// ldc is 2 bytes and ldc_w is 3 bytes // ldc is 2 bytes and ldc_w is 3 bytes
m = rc.insert_space_at(bci, 3, inst_buffer, THREAD); m = rc.insert_space_at(bci, 3, inst_buffer, CHECK);
if (m.is_null() || HAS_PENDING_EXCEPTION) {
guarantee(false, "insert_space_at() failed");
}
} }
// return the new method so that the caller can update // return the new method so that the caller can update