changeset 4996:ec4a087088bf

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 Fri, 07 Feb 2014 16:12:22 -0800
parents 2628a61dff77
children 5001d047e6ac
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	Fri Feb 07 16:11:17 2014 -0800
+++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp	Fri Feb 07 16:12:22 2014 -0800
@@ -1357,12 +1357,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()