1.1 --- a/src/share/vm/oops/constMethod.cpp Thu Nov 01 13:05:47 2012 +0100
1.2 +++ b/src/share/vm/oops/constMethod.cpp Thu Oct 11 12:25:42 2012 -0400
1.3 @@ -34,29 +34,30 @@
1.4 const u2 ConstMethod::UNSET_IDNUM = 0xFFFF;
1.5
1.6 ConstMethod* ConstMethod::allocate(ClassLoaderData* loader_data,
1.7 - int byte_code_size,
1.8 - int compressed_line_number_size,
1.9 - int localvariable_table_length,
1.10 - int exception_table_length,
1.11 - int checked_exceptions_length,
1.12 - TRAPS) {
1.13 + int byte_code_size,
1.14 + int compressed_line_number_size,
1.15 + int localvariable_table_length,
1.16 + int exception_table_length,
1.17 + int checked_exceptions_length,
1.18 + MethodType method_type,
1.19 + TRAPS) {
1.20 int size = ConstMethod::size(byte_code_size,
1.21 compressed_line_number_size,
1.22 localvariable_table_length,
1.23 exception_table_length,
1.24 checked_exceptions_length);
1.25 return new (loader_data, size, true, THREAD) ConstMethod(
1.26 - byte_code_size, compressed_line_number_size,
1.27 - localvariable_table_length, exception_table_length,
1.28 - checked_exceptions_length, size);
1.29 + byte_code_size, compressed_line_number_size, localvariable_table_length,
1.30 + exception_table_length, checked_exceptions_length, method_type, size);
1.31 }
1.32
1.33 ConstMethod::ConstMethod(int byte_code_size,
1.34 - int compressed_line_number_size,
1.35 - int localvariable_table_length,
1.36 - int exception_table_length,
1.37 - int checked_exceptions_length,
1.38 - int size) {
1.39 + int compressed_line_number_size,
1.40 + int localvariable_table_length,
1.41 + int exception_table_length,
1.42 + int checked_exceptions_length,
1.43 + MethodType method_type,
1.44 + int size) {
1.45
1.46 No_Safepoint_Verifier no_safepoint;
1.47 set_interpreter_kind(Interpreter::invalid);
1.48 @@ -69,6 +70,7 @@
1.49 compressed_line_number_size,
1.50 localvariable_table_length,
1.51 exception_table_length);
1.52 + set_method_type(method_type);
1.53 assert(this->size() == size, "wrong size for object");
1.54 }
1.55
