src/share/vm/oops/method.hpp

*** 71,82 ****
  // | access_flags                                         |
  // | vtable_index                                         |
  // |------------------------------------------------------|
  // | result_index (C++ interpreter only)                  |
  // |------------------------------------------------------|
! // | method_size             |   max_locals               |
! // | size_of_parameters      |   intrinsic_id|   flags    |
  // |------------------------------------------------------|
  // | throwout_count          |   num_breakpoints          |
  // |------------------------------------------------------|
  // | invocation_counter                                   |
  // | backedge_counter                                     |
--- 71,81 ----
  // | access_flags                                         |
  // | vtable_index                                         |
  // |------------------------------------------------------|
  // | result_index (C++ interpreter only)                  |
  // |------------------------------------------------------|
! // | method_size             |   intrinsic_id|   flags    |
  // |------------------------------------------------------|
  // | throwout_count          |   num_breakpoints          |
  // |------------------------------------------------------|
  // | invocation_counter                                   |
  // | backedge_counter                                     |
*** 114,125 ****
                                                   // note: can have vtables with >2**16 elements (because of inheritance)
  #ifdef CC_INTERP
    int               _result_index;               // C++ interpreter needs for converting results to/from stack
  #endif
    u2                _method_size;                // size of this object
-   u2                _max_locals;                 // Number of local variables used by this method
-   u2                _size_of_parameters;         // size of the parameter block (receiver + arguments) in words
    u1                _intrinsic_id;               // vmSymbols::intrinsic_id (0 == _none)
    u1                _jfr_towrite  : 1,           // Flags
                      _force_inline : 1,
                      _hidden       : 1,
                      _dont_inline  : 1,
--- 113,122 ----
*** 290,301 ****
    int  verifier_max_stack() const                { return constMethod()->max_stack(); }
    int           max_stack() const                { return constMethod()->max_stack() + extra_stack_entries(); }
    void      set_max_stack(int size)              {        constMethod()->set_max_stack(size); }
  
    // max locals
!   int  max_locals() const                        { return _max_locals; }
!   void set_max_locals(int size)                  { _max_locals = size; }
  
    int highest_comp_level() const;
    void set_highest_comp_level(int level);
    int highest_osr_comp_level() const;
    void set_highest_osr_comp_level(int level);
--- 287,298 ----
    int  verifier_max_stack() const                { return constMethod()->max_stack(); }
    int           max_stack() const                { return constMethod()->max_stack() + extra_stack_entries(); }
    void      set_max_stack(int size)              {        constMethod()->set_max_stack(size); }
  
    // max locals
!   int  max_locals() const                        { return constMethod()->max_locals(); }
!   void set_max_locals(int size)                  { constMethod()->set_max_locals(size); }
  
    int highest_comp_level() const;
    void set_highest_comp_level(int level);
    int highest_osr_comp_level() const;
    void set_highest_osr_comp_level(int level);
*** 309,319 ****
  
    int  interpreter_throwout_count() const        { return _interpreter_throwout_count; }
    void set_interpreter_throwout_count(int count) { _interpreter_throwout_count = count; }
  
    // size of parameters
!   int  size_of_parameters() const                { return _size_of_parameters; }
  
    bool has_stackmap_table() const {
      return constMethod()->has_stackmap_table();
    }
  
--- 306,317 ----
  
    int  interpreter_throwout_count() const        { return _interpreter_throwout_count; }
    void set_interpreter_throwout_count(int count) { _interpreter_throwout_count = count; }
  
    // size of parameters
!   int  size_of_parameters() const                { return constMethod()->size_of_parameters(); }
!   void set_size_of_parameters(int size)          { constMethod()->set_size_of_parameters(size); }
  
    bool has_stackmap_table() const {
      return constMethod()->has_stackmap_table();
    }
  
*** 586,597 ****
    static ByteSize const_offset()                 { return byte_offset_of(Method, _constMethod       ); }
    static ByteSize access_flags_offset()          { return byte_offset_of(Method, _access_flags      ); }
  #ifdef CC_INTERP
    static ByteSize result_index_offset()          { return byte_offset_of(Method, _result_index ); }
  #endif /* CC_INTERP */
-   static ByteSize size_of_locals_offset()        { return byte_offset_of(Method, _max_locals        ); }
-   static ByteSize size_of_parameters_offset()    { return byte_offset_of(Method, _size_of_parameters); }
    static ByteSize from_compiled_offset()         { return byte_offset_of(Method, _from_compiled_entry); }
    static ByteSize code_offset()                  { return byte_offset_of(Method, _code); }
    static ByteSize invocation_counter_offset()    { return byte_offset_of(Method, _invocation_counter); }
    static ByteSize backedge_counter_offset()      { return byte_offset_of(Method, _backedge_counter); }
    static ByteSize method_data_offset()           {
--- 584,593 ----
*** 794,806 ****
                             Array<AnnotationArray*>* methods_annotations,
                             Array<AnnotationArray*>* methods_parameter_annotations,
                             Array<AnnotationArray*>* methods_default_annotations,
                             bool idempotent = false);
  
-   // size of parameters
-   void set_size_of_parameters(int size)          { _size_of_parameters = size; }
- 
    // Deallocation function for redefine classes or if an error occurs
    void deallocate_contents(ClassLoaderData* loader_data);
  
    // Printing
  #ifndef PRODUCT
--- 790,799 ----