src/hotspot/share/interpreter/invocationCounter.hpp

*** 90,115 ****
    int    limit() const                           { return CompileThreshold; }
    Action action() const                          { return _action[state()]; }
    int    count() const                           { return _counter >> number_of_noncount_bits; }
  
  #ifdef CC_INTERP
    // Test counter using scaled limits like the asm interpreter would do rather than doing
    // the shifts to normalize the counter.
    // Checks sum of invocation_counter and backedge_counter as the template interpreter does.
    bool reached_InvocationLimit(InvocationCounter *back_edge_count) const {
      return (_counter & count_mask) + (back_edge_count->_counter & count_mask) >=
             (unsigned int) InterpreterInvocationLimit;
    }
-   bool reached_BackwardBranchLimit(InvocationCounter *back_edge_count) const {
-     return (_counter & count_mask) + (back_edge_count->_counter & count_mask) >=
-            (unsigned int) InterpreterBackwardBranchLimit;
-   }
-   // Do this just like asm interpreter does for max speed.
-   bool reached_ProfileLimit(InvocationCounter *back_edge_count) const {
-     return (_counter & count_mask) + (back_edge_count->_counter & count_mask) >=
-            (unsigned int) InterpreterProfileLimit;
-   }
  #endif // CC_INTERP
  
    void increment()                               { _counter += count_increment; }
  
  
--- 90,109 ----
    int    limit() const                           { return CompileThreshold; }
    Action action() const                          { return _action[state()]; }
    int    count() const                           { return _counter >> number_of_noncount_bits; }
  
  #ifdef CC_INTERP
+   static int InterpreterInvocationLimit;        // CompileThreshold scaled for interpreter use
+   static int InterpreterBackwardBranchLimit;    // A separate threshold for on stack replacement
+ 
    // Test counter using scaled limits like the asm interpreter would do rather than doing
    // the shifts to normalize the counter.
    // Checks sum of invocation_counter and backedge_counter as the template interpreter does.
    bool reached_InvocationLimit(InvocationCounter *back_edge_count) const {
      return (_counter & count_mask) + (back_edge_count->_counter & count_mask) >=
             (unsigned int) InterpreterInvocationLimit;
    }
  #endif // CC_INTERP
  
    void increment()                               { _counter += count_increment; }