提交 02db2f96 编写于 作者: S sspitsyn

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
上级 71655535
...@@ -1349,12 +1349,11 @@ bool VM_RedefineClasses::merge_constant_pools(constantPoolHandle old_cp, ...@@ -1349,12 +1349,11 @@ bool VM_RedefineClasses::merge_constant_pools(constantPoolHandle old_cp,
CHECK_0); CHECK_0);
} }
finalize_operands_merge(*merge_cp_p, THREAD);
RC_TRACE_WITH_THREAD(0x00020000, THREAD, RC_TRACE_WITH_THREAD(0x00020000, THREAD,
("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d", ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
*merge_cp_length_p, scratch_i, _index_map_count)); *merge_cp_length_p, scratch_i, _index_map_count));
} }
finalize_operands_merge(*merge_cp_p, THREAD);
return true; return true;
} // end merge_constant_pools() } // end merge_constant_pools()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册