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

8228596: Class redefinition fails when condy instructions are removed

Browse source 
Make sure has_dynamic_constant flag value gets copied to merged constant pool, when it is set to TRUE

Reviewed-by: coleenp, dcubed, sspitsyn
This commit is contained in:
Harold Seigel 2019-07-29 09:57:37 -04:00
parent f5b92a4ca7
commit 3d6ba9735f
3 changed files with 112 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/hotspot/share/prims/jvmtiRedefineClasses.cpp
View file

@ -1623,6 +1623,11 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
return JVMTI_ERROR_INTERNAL;
}
if (old_cp->has_dynamic_constant()) {
merge_cp->set_has_dynamic_constant();
scratch_cp->set_has_dynamic_constant();
}
log_info(redefine, class, constantpool)("merge_cp_len=%d, index_map_len=%d", merge_cp_length, _index_map_count);
if (_index_map_count == 0) {
@ -3246,6 +3251,10 @@ void VM_RedefineClasses::set_new_constant_pool(
// reference to the cp holder is needed for copy_operands()
smaller_cp->set_pool_holder(scratch_class);
if (scratch_cp->has_dynamic_constant()) {
smaller_cp->set_has_dynamic_constant();
}
scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
if (HAS_PENDING_EXCEPTION) {
// Exception is handled in the caller