Merge
authorminqi
Tue, 23 Jul 2013 12:50:15 -0700
changeset 18954 12224a2c5708
parent 18951 eb19defdc889 (diff)
parent 18953 dedc970b6f72 (current diff)
child 18960 ba4ec0aa2ffd
child 18985 fe13d7e17a2c
Merge
--- a/hotspot/src/share/vm/oops/method.cpp	Mon Jul 22 22:21:57 2013 -0700
+++ b/hotspot/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(),