Fix for NativeCodeData that some fields references the middle of another chunk

Author: leirocks

lib/Backend/BailOut.h

@@ -176,7 +176,12 @@ class BailOutRecord
         FixupNativeDataPointer(ehBailoutData, chunkList);
         FixupNativeDataPointer(stackLiteralBailOutRecord, chunkList);
 #ifdef _M_IX86
-        FixupNativeDataPointer(startCallArgRestoreAdjustCounts, chunkList);
+        // special handling for startCallOutParamCounts and outParamOffsets, becuase it points to middle of the allocation
+        if (argOutOffsetInfo)
+        {
+            uint* startCallArgRestoreAdjustCountsStart = startCallArgRestoreAdjustCounts - argOutOffsetInfo->startCallIndex;
+            NativeCodeData::AddFixupEntry(startCallArgRestoreAdjustCounts, startCallArgRestoreAdjustCountsStart, &this->startCallArgRestoreAdjustCounts, this, chunkList);
+        }
 #endif
     }
 
@@ -262,14 +267,21 @@ class BailOutRecord
         int * outParamOffsets;
         uint startCallCount;
         uint argOutSymStart;
+        uint startCallIndex;
         void Fixup(NativeCodeData::DataChunk* chunkList)
         {
             FixupNativeDataPointer(argOutFloat64Syms, chunkList);
             FixupNativeDataPointer(argOutLosslessInt32Syms, chunkList);
             FixupNativeDataPointer(argOutSimd128F4Syms, chunkList);
             FixupNativeDataPointer(argOutSimd128I4Syms, chunkList);
-            FixupNativeDataPointer(startCallOutParamCounts, chunkList);
-            FixupNativeDataPointer(outParamOffsets, chunkList);
+
+            // special handling for startCallOutParamCounts and outParamOffsets, becuase it points to middle of the allocation
+            uint* startCallOutParamCountsStart = startCallOutParamCounts - startCallIndex;
+            NativeCodeData::AddFixupEntry(startCallOutParamCounts, startCallOutParamCountsStart, &this->startCallOutParamCounts, this, chunkList);
+
+            int* outParamOffsetsStart = outParamOffsets - argOutSymStart;
+            NativeCodeData::AddFixupEntry(outParamOffsets, outParamOffsetsStart, &this->outParamOffsets, this, chunkList);
+            
         }
     };
 

lib/Backend/LinearScan.cpp

@@ -1649,6 +1649,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
             if (currentBailOutRecord->argOutOffsetInfo->outParamOffsets == nullptr)
             {
                 Assert(currentBailOutRecord->argOutOffsetInfo->startCallOutParamCounts == nullptr);
+                currentBailOutRecord->argOutOffsetInfo->startCallIndex = i;
                 currentBailOutRecord->argOutOffsetInfo->startCallOutParamCounts = &startCallOutParamCounts[i];
 #ifdef _M_IX86
                 currentBailOutRecord->startCallArgRestoreAdjustCounts = &startCallArgRestoreAdjustCounts[i];

lib/Backend/NativeCodeData.cpp

@@ -18,11 +18,18 @@ NativeCodeData::~NativeCodeData()
     PERF_COUNTER_SUB(Code, TotalNativeCodeDataSize, this->size);
 }
 
+void
+NativeCodeData::AddFixupEntry(void* targetAddr, void* addrToFixup, void* startAddress, DataChunk * chunkList)
+{
+    return NativeCodeData::AddFixupEntry(targetAddr, targetAddr, addrToFixup, startAddress, chunkList);
+}
+
 // targetAddr: target address
+// targetStartAddr: target start address, some fied might reference to middle of another data chunk, like outParamOffsets
 // startAddress: current data start address
 // addrToFixup: address that currently pointing to dataAddr, which need to be updated
 void
-NativeCodeData::AddFixupEntry(void* targetAddr, void* addrToFixup, void* startAddress, DataChunk * chunkList)
+NativeCodeData::AddFixupEntry(void* targetAddr, void* targetStartAddr, void* addrToFixup, void* startAddress, DataChunk * chunkList)
 {
     Assert(addrToFixup >= startAddress);
     Assert(((__int64)addrToFixup) % sizeof(void*) == 0);
@@ -32,7 +39,11 @@ NativeCodeData::AddFixupEntry(void* targetAddr, void* addrToFixup, void* startAd
         return;
     }
 
-    DataChunk* targetChunk = NativeCodeData::GetDataChunk(targetAddr);
+    Assert(targetStartAddr);
+    
+    unsigned int inDataOffset = (unsigned int)((char*)targetAddr - (char*)targetStartAddr);
+    DataChunk* targetChunk = NativeCodeData::GetDataChunk(targetStartAddr);
+    Assert(targetChunk->len >= inDataOffset);
 
 #if DBG
     bool foundTargetChunk = false;
@@ -42,15 +53,15 @@ NativeCodeData::AddFixupEntry(void* targetAddr, void* addrToFixup, void* startAd
         chunkList = chunkList->next;
     }
     AssertMsg(foundTargetChunk, "current pointer is not allocated with NativeCodeData allocator?"); // change to valid check instead of assertion?
-#endif
+#endif    
 
     DataChunk* chunk = NativeCodeData::GetDataChunk(startAddress);
 
     NativeDataFixupEntry* entry = (NativeDataFixupEntry*)midl_user_allocate(sizeof(NativeDataFixupEntry));
     entry->addrOffset = (unsigned int)((__int64)addrToFixup - (__int64)startAddress);
     Assert(entry->addrOffset <= chunk->len - sizeof(void*));    
 
-    entry->targetTotalOffset = targetChunk->offset;
+    entry->targetTotalOffset = targetChunk->offset + inDataOffset;
     entry->next = chunk->fixupList;
     chunk->fixupList = entry;
 

lib/Backend/NativeCodeData.h

@@ -62,6 +62,7 @@ class NativeCodeData
 
     static void VerifyExistFixupEntry(void* targetAddr, void* addrToFixup, void* startAddress);
     static void AddFixupEntry(void* targetAddr, void* addrToFixup, void* startAddress, DataChunk * chunkList);
+    static void AddFixupEntry(void* targetAddr, void* targetStartAddr, void* addrToFixup, void* startAddress, DataChunk * chunkList);
     static void AddFixupEntryForPointerArray(void* startAddress, DataChunk * chunkList);
     static void DeleteChunkList(DataChunk * chunkList);
 public:

lib/Backend/NativeCodeGenerator.cpp

@@ -916,7 +916,7 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor
 
                         if (PHASE_TRACE1(Js::NativeCodeDataPhase))
                         {
-                            Output::Print(L"\t NativeCodeData Fixup Entry: +%p(%p) ==> %p:\n", addrToFixup, *(void**)(addrToFixup), targetAddr);
+                            Output::Print(L"\tEntry: +%x %p(%p) ==> %p\n", updateList->addrOffset, addrToFixup, *(void**)(addrToFixup), targetAddr);
                         }
 
                         *(void**)(addrToFixup) = targetAddr;