Mercurial > hg > graal-jvmci-8

comparison src/share/vm/prims/jvmtiRedefineClasses.cpp @ 10382:e7d29a019a3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 43083e670adf
children 825e6cb66923
comparison
equal deleted inserted replaced
10381:4552a7633a07 10382:e7d29a019a3c
1347 // referenced entries to *merge_cp_p. 1347 // referenced entries to *merge_cp_p.
1348 append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p, 1348 append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p,
1349 CHECK_0); 1349 CHECK_0);
1350 } 1350 }
1351 1351
1352 finalize_operands_merge(*merge_cp_p, THREAD);
1353
1354 RC_TRACE_WITH_THREAD(0x00020000, THREAD, 1352 RC_TRACE_WITH_THREAD(0x00020000, THREAD,
1355 ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d", 1353 ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
1356 *merge_cp_length_p, scratch_i, _index_map_count)); 1354 *merge_cp_length_p, scratch_i, _index_map_count));
1357 } 1355 }
1356 finalize_operands_merge(*merge_cp_p, THREAD);
1358 1357
1359 return true; 1358 return true;
1360 } // end merge_constant_pools() 1359 } // end merge_constant_pools()
1361 1360
1362 1361