Mercurial > hg > openjdk > jdk8 > hotspot
changeset 4779:e7d29a019a3c
8014052: JSR292: assert(end_offset == next_offset) failed: matched ending
Summary: A call to the finalize_operands_merge() must be unconditional
Reviewed-by: kvn, twisti
Contributed-by: serguei.spitsyn@oracle.com
| author | sspitsyn |
|---|---|
| date | Mon, 03 Jun 2013 14:28:37 -0700 |
| parents | 4552a7633a07 |
| children | 2f004f9dc9e1 |
| files | src/share/vm/prims/jvmtiRedefineClasses.cpp |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiRedefineClasses.cpp Mon Jun 03 10:00:10 2013 -0400 +++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp Mon Jun 03 14:28:37 2013 -0700 @@ -1349,12 +1349,11 @@ 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()