1.1 --- a/src/share/vm/oops/method.hpp Thu Dec 20 10:22:19 2012 +0100
1.2 +++ b/src/share/vm/oops/method.hpp Mon Dec 24 11:46:38 2012 -0800
1.3 @@ -73,8 +73,7 @@
1.4 // |------------------------------------------------------|
1.5 // | result_index (C++ interpreter only) |
1.6 // |------------------------------------------------------|
1.7 -// | method_size | max_locals |
1.8 -// | size_of_parameters | intrinsic_id| flags |
1.9 +// | method_size | intrinsic_id| flags |
1.10 // |------------------------------------------------------|
1.11 // | throwout_count | num_breakpoints |
1.12 // |------------------------------------------------------|
1.13 @@ -116,8 +115,6 @@
1.14 int _result_index; // C++ interpreter needs for converting results to/from stack
1.15 #endif
1.16 u2 _method_size; // size of this object
1.17 - u2 _max_locals; // Number of local variables used by this method
1.18 - u2 _size_of_parameters; // size of the parameter block (receiver + arguments) in words
1.19 u1 _intrinsic_id; // vmSymbols::intrinsic_id (0 == _none)
1.20 u1 _jfr_towrite : 1, // Flags
1.21 _force_inline : 1,
1.22 @@ -299,8 +296,8 @@
1.23 void set_max_stack(int size) { constMethod()->set_max_stack(size); }
1.24
1.25 // max locals
1.26 - int max_locals() const { return _max_locals; }
1.27 - void set_max_locals(int size) { _max_locals = size; }
1.28 + int max_locals() const { return constMethod()->max_locals(); }
1.29 + void set_max_locals(int size) { constMethod()->set_max_locals(size); }
1.30
1.31 int highest_comp_level() const;
1.32 void set_highest_comp_level(int level);
1.33 @@ -318,7 +315,8 @@
1.34 void set_interpreter_throwout_count(int count) { _interpreter_throwout_count = count; }
1.35
1.36 // size of parameters
1.37 - int size_of_parameters() const { return _size_of_parameters; }
1.38 + int size_of_parameters() const { return constMethod()->size_of_parameters(); }
1.39 + void set_size_of_parameters(int size) { constMethod()->set_size_of_parameters(size); }
1.40
1.41 bool has_stackmap_table() const {
1.42 return constMethod()->has_stackmap_table();
1.43 @@ -595,8 +593,6 @@
1.44 #ifdef CC_INTERP
1.45 static ByteSize result_index_offset() { return byte_offset_of(Method, _result_index ); }
1.46 #endif /* CC_INTERP */
1.47 - static ByteSize size_of_locals_offset() { return byte_offset_of(Method, _max_locals ); }
1.48 - static ByteSize size_of_parameters_offset() { return byte_offset_of(Method, _size_of_parameters); }
1.49 static ByteSize from_compiled_offset() { return byte_offset_of(Method, _from_compiled_entry); }
1.50 static ByteSize code_offset() { return byte_offset_of(Method, _code); }
1.51 static ByteSize invocation_counter_offset() { return byte_offset_of(Method, _invocation_counter); }
1.52 @@ -804,9 +800,6 @@
1.53 Array<AnnotationArray*>* methods_type_annotations,
1.54 bool idempotent = false);
1.55
1.56 - // size of parameters
1.57 - void set_size_of_parameters(int size) { _size_of_parameters = size; }
1.58 -
1.59 // Deallocation function for redefine classes or if an error occurs
1.60 void deallocate_contents(ClassLoaderData* loader_data);
1.61
