*** old/src/share/vm/opto/parse.hpp	Wed Jun 22 10:38:56 2011
--- new/src/share/vm/opto/parse.hpp	Wed Jun 22 10:38:56 2011

*** 48,58 ****
--- 48,58 ----
    uint        _count_inline_bcs;  // Accumulated count of inlined bytecodes
    // Call-site count / interpreter invocation count, scaled recursively.
    // Always between 0.0 and 1.0.  Represents the percentage of the method's
    // total execution time used at this call site.
    const float _site_invoke_ratio;
!   const int   _site_depth_adjust;
!   const int   _max_inline_level;  // the maximum inline level for this sub-tree (may be adjusted)
    float compute_callee_frequency( int caller_bci ) const;
  
    GrowableArray<InlineTree*> _subtrees;
    friend class Compile;
  

*** 61,71 ****
--- 61,71 ----
               const InlineTree* caller_tree,
               ciMethod* callee_method,
               JVMState* caller_jvms,
               int caller_bci,
               float site_invoke_ratio,
!              int site_depth_adjust);
!              int max_inline_level);
    InlineTree *build_inline_tree_for_callee(ciMethod* callee_method,
                                             JVMState* caller_jvms,
                                             int caller_bci);
    const char* try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result);
    const char* should_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) const;

*** 72,90 ****
--- 72,90 ----
    const char* should_not_inline(ciMethod* callee_method, ciMethod* caller_method, WarmCallInfo* wci_result) const;
    void        print_inlining(ciMethod *callee_method, int caller_bci, const char *failure_msg) const;
  
    InlineTree *caller_tree()       const { return _caller_tree;  }
    InlineTree* callee_at(int bci, ciMethod* m) const;
!   int         inline_depth()      const { return stack_depth() + _site_depth_adjust; }
!   int         inline_level()      const { return stack_depth(); }
    int         stack_depth()       const { return _caller_jvms ? _caller_jvms->depth() : 0; }
  
  public:
    static InlineTree* build_inline_tree_root();
    static InlineTree* find_subtree_from_root(InlineTree* root, JVMState* jvms, ciMethod* callee, bool create_if_not_found = false);
  
    // For temporary (stack-allocated, stateless) ilts:
!   InlineTree(Compile* c, ciMethod* callee_method, JVMState* caller_jvms, float site_invoke_ratio, int site_depth_adjust);
!   InlineTree(Compile* c, ciMethod* callee_method, JVMState* caller_jvms, float site_invoke_ratio, int max_inline_level);
  
    // InlineTree enum
    enum InlineStyle {
      Inline_do_not_inline             =   0, //
      Inline_cha_is_monomorphic        =   1, //