8014052: JSR292: assert(end_offset == next_offset) failed: matched ending

A call to the finalize_operands_merge() must be unconditional

Reviewed-by: kvn, twisti
This commit is contained in:
Serguei Spitsyn 2013-06-03 14:28:37 -07:00 committed by Serguei Spitsyn
parent 02a27e2824
commit 6d485348e1

@ -1349,12 +1349,11 @@ bool VM_RedefineClasses::merge_constant_pools(constantPoolHandle old_cp,
CHECK_0);
}
finalize_operands_merge(*merge_cp_p, THREAD);
RC_TRACE_WITH_THREAD(0x00020000, THREAD,
("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
*merge_cp_length_p, scratch_i, _index_map_count));
}
finalize_operands_merge(*merge_cp_p, THREAD);
return true;
} // end merge_constant_pools()