[1.8>1.9] Revert "OS#15659337: Try to allocate JIT code in PreReserve…

…dSegment even if CFG is not enabled" This reverts commit d8b60d1.
chakra-core · Feb 8, 2018 · dc3f1d2 · dc3f1d2
2 parents 91ec1ef + 01b638e
commit dc3f1d2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/Backend/Func.cpp b/lib/Backend/Func.cpp
@@ -1140,11 +1140,12 @@ 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()
+        !IsJitInDebugMode() && GetThreadContextInfo()->IsCFGEnabled()
+        //&& !GetScriptContext()->IsScriptContextInDebugMode()
 #if _M_IX86
         && m_workItem->GetJitMode() == ExecutionMode::FullJit