deps: update ChakraCore to chakra-core/ChakraCore@9d70c00ad7

[1.8>1.9] [MERGE #4621 @leirocks] fix for wrong signed/unsigned convertion with RtlAddGrowableFunctionTable return value Merge pull request #4621 from leirocks:xdata2 Reviewed-By: chakrabot <[email protected]>
nodejs · Feb 1, 2018 · 8701f4d · 8701f4d
1 parent 39ea00c
commit 8701f4d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/deps/chakrashim/core/lib/Backend/PDataManager.cpp b/deps/chakrashim/core/lib/Backend/PDataManager.cpp
@@ -21,7 +21,7 @@ void PDataManager::RegisterPdata(RUNTIME_FUNCTION* pdataStart, _In_ const ULONG_
 
         // Since we do not expect many thunk functions to be created, we are using 1 table/function
         // for now. This can be optimized further if needed.
-        DWORD status = NtdllLibrary::Instance->AddGrowableFunctionTable(pdataTable,
+        NTSTATUS status = NtdllLibrary::Instance->AddGrowableFunctionTable(pdataTable,
             pdataStart,
             entryCount,
             maxEntryCount,

diff --git a/deps/chakrashim/core/lib/Common/Core/DelayLoadLibrary.cpp b/deps/chakrashim/core/lib/Common/Core/DelayLoadLibrary.cpp
@@ -63,7 +63,7 @@ LPCTSTR NtdllLibrary::GetLibraryName() const
 #if PDATA_ENABLED
 
 _Success_(return == 0)
-DWORD NtdllLibrary::AddGrowableFunctionTable( _Out_ PVOID * DynamicTable,
+NtdllLibrary::NTSTATUS NtdllLibrary::AddGrowableFunctionTable( _Out_ PVOID * DynamicTable,
     _In_reads_(MaximumEntryCount) PRUNTIME_FUNCTION FunctionTable,
     _In_ DWORD EntryCount,
     _In_ DWORD MaximumEntryCount,
@@ -82,7 +82,7 @@ DWORD NtdllLibrary::AddGrowableFunctionTable( _Out_ PVOID * DynamicTable,
                 return 1;
             }
         }
-        DWORD status = addGrowableFunctionTable(DynamicTable,
+        NTSTATUS status = addGrowableFunctionTable(DynamicTable,
             FunctionTable,
             EntryCount,
             MaximumEntryCount,

diff --git a/deps/chakrashim/core/lib/Common/Core/DelayLoadLibrary.h b/deps/chakrashim/core/lib/Common/Core/DelayLoadLibrary.h
@@ -126,7 +126,7 @@ class NtdllLibrary : protected DelayLoadLibrary
 
 #if PDATA_ENABLED
     _Success_(return == 0)
-    DWORD AddGrowableFunctionTable(_Out_ PVOID * DynamicTable,
+    NTSTATUS AddGrowableFunctionTable(_Out_ PVOID * DynamicTable,
         _In_reads_(MaximumEntryCount) PRUNTIME_FUNCTION FunctionTable,
         _In_ DWORD EntryCount,
         _In_ DWORD MaximumEntryCount,

diff --git a/deps/chakrashim/core/lib/Common/Memory/amd64/XDataAllocator.cpp b/deps/chakrashim/core/lib/Common/Memory/amd64/XDataAllocator.cpp
@@ -134,7 +134,7 @@ void XDataAllocator::Register(XDataAllocation * xdataInfo, ULONG_PTR functionSta
         Assert(runtimeFunction == NULL);
 #endif
 
-        DWORD status = NtdllLibrary::Instance->AddGrowableFunctionTable(&xdataInfo->functionTable,
+        NTSTATUS status = NtdllLibrary::Instance->AddGrowableFunctionTable(&xdataInfo->functionTable,
             &xdataInfo->pdata,
             /*MaxEntryCount*/ 1,
             /*Valid entry count*/ 1,

diff --git a/deps/chakrashim/core/lib/Common/Memory/arm/XDataAllocator.cpp b/deps/chakrashim/core/lib/Common/Memory/arm/XDataAllocator.cpp
@@ -81,7 +81,7 @@ void XDataAllocator::Register(XDataAllocation * xdataInfo, DWORD functionStart,
 
     // Since we do not expect many thunk functions to be created, we are using 1 table/function
     // for now. This can be optimized further if needed.
-    DWORD status = NtdllLibrary::Instance->AddGrowableFunctionTable(&xdataInfo->functionTable,
+    NTSTATUS status = NtdllLibrary::Instance->AddGrowableFunctionTable(&xdataInfo->functionTable,
         pdataArray,
         /*MaxEntryCount*/ xdataInfo->pdataCount,
         /*Valid entry count*/ xdataInfo->pdataCount,

diff --git a/deps/chakrashim/core/lib/Common/Memory/arm64/XDataAllocator.cpp b/deps/chakrashim/core/lib/Common/Memory/arm64/XDataAllocator.cpp
@@ -125,7 +125,7 @@ void XDataAllocator::Register(XDataAllocation * xdataInfo, ULONG_PTR functionSta
     xdataInfo->pdata.BeginAddress = (DWORD)(functionStart - baseAddress);
     xdataInfo->pdata.UnwindData = (DWORD)((intptr_t)xdataInfo->address - baseAddress);
 
-    DWORD status = NtdllLibrary::Instance->AddGrowableFunctionTable(&xdataInfo->functionTable,
+    NTSTATUS status = NtdllLibrary::Instance->AddGrowableFunctionTable(&xdataInfo->functionTable,
         &xdataInfo->pdata,
         /*MaxEntryCount*/ 1,
         /*Valid entry count*/ 1,