# HG changeset patch
# User minqi
# Date 1374609015 25200
# Node ID c0f353803b47c305a2c4e5a6355bbba53ca35e9b
# Parent  16511b7e3d35861d37c3ba6771b538e9ca3a7686# Parent  5165d659cebdfffb8609ae28e32c2e67ec229832
Merge

diff -r 5165d659cebd -r c0f353803b47 src/share/vm/oops/method.cpp
--- a/src/share/vm/oops/method.cpp	Mon Jul 22 22:21:57 2013 -0700
+++ b/src/share/vm/oops/method.cpp	Tue Jul 23 12:50:15 2013 -0700
@@ -1163,6 +1163,7 @@
   newm->constMethod()->set_constMethod_size(new_const_method_size);
   newm->set_method_size(new_method_size);
   assert(newm->code_size() == new_code_length, "check");
+  assert(newm->method_parameters_length() == method_parameters_len, "check");
   assert(newm->checked_exceptions_length() == checked_exceptions_len, "check");
   assert(newm->exception_table_length() == exception_table_len, "check");
   assert(newm->localvariable_table_length() == localvariable_len, "check");
@@ -1174,6 +1175,12 @@
            new_compressed_linenumber_table,
            new_compressed_linenumber_size);
   }
+  // Copy method_parameters
+  if (method_parameters_len > 0) {
+    memcpy(newm->method_parameters_start(),
+           m->method_parameters_start(),
+           method_parameters_len * sizeof(MethodParametersElement));
+  }
   // Copy checked_exceptions
   if (checked_exceptions_len > 0) {
     memcpy(newm->checked_exceptions_start(),