Merge branch 'master' into master-merge

1 files changed, 20 insertions, 0 deletions

diff --git a/src/vm/jitinterface.h b/src/vm/jitinterface.h
index ccb88d8a42..92e392fc74 100644
--- a/src/vm/jitinterface.h
+++ b/src/vm/jitinterface.h
@@ -1361,12 +1361,30 @@ public:
         LIMITED_METHOD_CONTRACT;
         return m_fRel32Overflow;
     }
+
+    size_t GetReserveForJumpStubs()
+    {
+        LIMITED_METHOD_CONTRACT;
+        return m_reserveForJumpStubs;
+    }
+
+    void SetReserveForJumpStubs(size_t value)
+    {
+        LIMITED_METHOD_CONTRACT;
+        m_reserveForJumpStubs = value;
+    }
 #else
     BOOL JitAgain()
     {
         LIMITED_METHOD_CONTRACT;
         return FALSE;
     }
+
+    size_t GetReserveForJumpStubs()
+    {
+        LIMITED_METHOD_CONTRACT;
+        return 0;
+    }
 #endif
 
     CEEJitInfo(MethodDesc* fd,  COR_ILMETHOD_DECODER* header, 
@@ -1386,6 +1404,7 @@ public:
 #ifdef _TARGET_AMD64_
           m_fAllowRel32(FALSE),
           m_fRel32Overflow(FALSE),
+          m_reserveForJumpStubs(0),
 #endif
           m_GCinfo_len(0),
           m_EHinfo_len(0),
@@ -1470,6 +1489,7 @@ protected :
     BOOL                    m_fAllowRel32;      // Use 32-bit PC relative address modes
     BOOL                    m_fRel32Overflow;   // Overflow while trying to use encode 32-bit PC relative address. 
                                                 // The code will need to be regenerated with m_fRel32Allowed == FALSE.
+    size_t                  m_reserveForJumpStubs; // Space to reserve for jump stubs when allocating code
 #endif
 
 #if defined(_DEBUG)