Merge pull request #6213 from dotnet/master

Merge master to nmirror

2 files changed, 15 insertions, 4 deletions

diff --git a/src/Native/ObjWriter/objwriter.cpp b/src/Native/ObjWriter/objwriter.cpp
index 4470f04be..bdf1016dc 100644
--- a/src/Native/ObjWriter/objwriter.cpp
+++ b/src/Native/ObjWriter/objwriter.cpp
@@ -921,13 +921,13 @@ void ObjectWriter::EmitARMExIdxCode(int Offset, const char *Blob)
     ATS.emitPad(CfiCode->Offset);
     break;
   case CFI_REL_OFFSET:
-    RegList.push_back(CfiCode->DwarfReg);
+    RegList.push_back(CfiCode->DwarfReg + 14); // See ARMRegEncodingTable in ARMGenRegisterInfo.inc by getEncodingValue
     ATS.emitRegSave(RegList, false);
     break;
   case CFI_DEF_CFA_REGISTER:
     assert(CfiCode->Offset == 0 &&
            "Unexpected Offset Value for OpDefCfaRegister");
-    ATS.emitMovSP(CfiCode->DwarfReg, 0);
+    ATS.emitMovSP(CfiCode->DwarfReg + 14, 0); // See ARMRegEncodingTable in ARMGenRegisterInfo.inc by getEncodingValue
     break;
   default:
     assert(false && "Unrecognized CFI");
diff --git a/src/Native/jitinterface/jithost.cpp b/src/Native/jitinterface/jithost.cpp
index 2e2f17bfb..f433cf5b1 100644
--- a/src/Native/jitinterface/jithost.cpp
+++ b/src/Native/jitinterface/jithost.cpp
@@ -36,12 +36,12 @@ public:
     JitHost(JitConfigProvider* pConfigProvider)
         : pConfigProvider(pConfigProvider) { }
 
-    virtual void* allocateMemory(size_t size, bool usePageAllocator = false)
+    virtual void* allocateMemory(size_t size)
     {
         return malloc(size);
     }
 
-    virtual void freeMemory(void* block, bool usePageAllocator = false)
+    virtual void freeMemory(void* block)
     {
         free(block);
     }
@@ -76,6 +76,17 @@ public:
     {
         free(value);
     }
+
+    virtual void* allocateSlab(size_t size, size_t* pActualSize)
+    {
+        *pActualSize = size;
+        return allocateMemory(size);
+    }
+
+    virtual void freeSlab(void* slab, size_t actualSize)
+    {
+        freeMemory(slab);
+    }
 };
 
 DLL_EXPORT void* GetJitHost(JitConfigProvider* pConfigProvider)