Inliner: restore ability to dump jit time, plus some cleanup

I zeroed out the jit time measurement when refactoring the data dumping
code to live in the InlineStrategy class, because it required adding a
helper to the Compiler class. Didn't mean to leave it this way, but did.
So, fixing it how I'd meant to all along.

Also, move a few of the inlining related constants and setup computation
over to InlineStrategy. I'd move `DEFAULT_MAX_INLINE_SIZE` too, but it
ends up getting used for some non-inlining purposes, so will hold off on
cleaning that part up.

1 files changed, 18 insertions, 2 deletions

diff --git a/src/jit/inline.h b/src/jit/inline.h
index 0ce95d7b97..c23d8fa52a 100644
--- a/src/jit/inline.h
+++ b/src/jit/inline.h
@@ -661,6 +661,12 @@ public:
     // Root context
     InlineContext* GetRootContext();
 
+    // Get IL size for maximum allowable inline
+    unsigned GetMaxInlineILSize()
+    {
+        return m_MaxInlineSize;
+    }
+
     // Number of successful inlines into the root.
     unsigned GetInlineCount()
     {
@@ -679,12 +685,18 @@ public:
     // Dump textual description of inlines done so far.
     void Dump();
 
-
     // Dump data-format description of inlines done so far.
     void DumpData();
 
 #endif // defined(DEBUG) || defined(INLINE_DATA)
 
+    // Some inline limit values
+    enum
+    {
+        ALWAYS_INLINE_SIZE = 16,
+        IMPLEMENTATION_MAX_INLINE_SIZE= _UI16_MAX
+    };
+
 private:
 
     // Create a context for the root method.
@@ -696,7 +708,10 @@ private:
     // Cap on allowable increase in jit time due to inlining.
     // Multiplicative, so BUDGET = 10 means up to 10x increase
     // in jit time.
-    enum { BUDGET = 10 };
+    enum
+    {
+        BUDGET = 10
+    };
 
     // Estimate the jit time change because of this inline.
     int EstimateTime(InlineContext* context);
@@ -718,6 +733,7 @@ private:
     unsigned       m_CandidateCount;
     unsigned       m_InlineAttemptCount;
     unsigned       m_InlineCount;
+    unsigned       m_MaxInlineSize;
     int            m_InitialTimeBudget;
     int            m_InitialTimeEstimate;
     int            m_CurrentTimeBudget;