Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit eb9ae3a

Browse files
agarwal-sandeepchakrabot
authored andcommitted
deps: update ChakraCore to chakra-core/ChakraCore@c50dfa8d83
[1.8>1.9] [MERGE #4661 @agarwal-sandeep] OS#15659337: Try to allocate JIT code in PreReservedSegment even if CFG is not enabled Merge pull request #4661 from agarwal-sandeep:vso15659337 This speeds up stack walking IsNativeAddress checks when CFG is not enabled. Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>
1 parent c7429c7 commit eb9ae3a

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

deps/chakrashim/core/lib/Backend/Func.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,8 +1144,7 @@ bool Func::CanAllocInPreReservedHeapPageSegment ()
11441144
{
11451145
#ifdef _CONTROL_FLOW_GUARD
11461146
return PHASE_FORCE1(Js::PreReservedHeapAllocPhase) || (!PHASE_OFF1(Js::PreReservedHeapAllocPhase) &&
1147-
!IsJitInDebugMode() && GetThreadContextInfo()->IsCFGEnabled()
1148-
//&& !GetScriptContext()->IsScriptContextInDebugMode()
1147+
!IsJitInDebugMode()
11491148
#if _M_IX86
11501149
&& m_workItem->GetJitMode() == ExecutionMode::FullJit
11511150

deps/chakrashim/core/lib/Common/Memory/SectionAllocWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ LPVOID PreReservedSectionAllocWrapper::AllocPages(LPVOID lpAddress, DECLSPEC_GUA
868868
size_t dwSize = pageCount * AutoSystemInfo::PageSize;
869869

870870
AssertMsg(isCustomHeapAllocation, "PreReservation used for allocations other than CustomHeap?");
871-
AssertMsg(AutoSystemInfo::Data.IsCFGEnabled() || PHASE_FORCE1(Js::PreReservedHeapAllocPhase), "PreReservation without CFG ?");
871+
872872
Assert(dwSize != 0);
873873

874874
{

deps/chakrashim/core/lib/Common/Memory/VirtualAllocWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ LPVOID PreReservedVirtualAllocWrapper::AllocPages(LPVOID lpAddress, size_t pageC
279279
size_t dwSize = pageCount * AutoSystemInfo::PageSize;
280280

281281
AssertMsg(isCustomHeapAllocation, "PreReservation used for allocations other than CustomHeap?");
282-
AssertMsg(AutoSystemInfo::Data.IsCFGEnabled() || PHASE_FORCE1(Js::PreReservedHeapAllocPhase), "PreReservation without CFG ?");
282+
283283
Assert(dwSize != 0);
284284

285285
{

0 commit comments

Comments
 (0)