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

Commit

Permalink
deps: update ChakraCore to chakra-core/ChakraCore@a9a368f3da
Browse files Browse the repository at this point in the history
[1.8>1.9] [MERGE #4647 @agarwal-sandeep] OS#15659337: Try to allocate JIT code in PreReservedSegment even if CFG is not enabled

Merge pull request #4647 from agarwal-sandeep:vso15659337

This speeds up stack walking IsNativeAddress checks when CFG is not enabled.

Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>
  • Loading branch information
agarwal-sandeep authored and chakrabot committed Feb 8, 2018
1 parent d657866 commit 6bdbd08
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions deps/chakrashim/core/lib/Backend/Func.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1140,12 +1140,11 @@ Func::IsAggressiveIntTypeSpecDisabled() const
return (HasProfileInfo() && GetReadOnlyProfileInfo()->IsAggressiveIntTypeSpecDisabled(IsLoopBody())) || m_output.IsAggressiveIntTypeSpecDisabled();
}

bool Func::CanAllocInPreReservedHeapPageSegment ()
bool Func::CanAllocInPreReservedHeapPageSegment()
{
#ifdef _CONTROL_FLOW_GUARD
return PHASE_FORCE1(Js::PreReservedHeapAllocPhase) || (!PHASE_OFF1(Js::PreReservedHeapAllocPhase) &&
!IsJitInDebugMode() && GetThreadContextInfo()->IsCFGEnabled()
//&& !GetScriptContext()->IsScriptContextInDebugMode()
!IsJitInDebugMode()
#if _M_IX86
&& m_workItem->GetJitMode() == ExecutionMode::FullJit

Expand Down

0 comments on commit 6bdbd08

Please sign in to comment.