fix issue that prevented using prereserved segment on x86

chakra-core · Sep 15, 2016 · 1e7d27e · 1e7d27e
1 parent 8f5d428
commit 1e7d27e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/lib/Backend/NativeCodeGenerator.cpp b/lib/Backend/NativeCodeGenerator.cpp
@@ -2865,12 +2865,23 @@ NativeCodeGenerator::GatherCodeGenData(Js::FunctionBody *const topFunctionBody,
     if (JITManager::GetJITManager()->IsOOPJITEnabled() )
     {
         // ensure jit contexts have been set up
-        scriptContext->GetThreadContext()->EnsureJITThreadContext();
         if (!scriptContext->GetRemoteScriptAddr())
         {
             scriptContext->InitializeRemoteScriptContext();
         }
 
+        bool allowPrereserveAlloc = true;
+#if !_M_X64_OR_ARM64
+        if (this->scriptContext->webWorkerId != Js::Constants::NonWebWorkerContextId)
+        {
+            allowPrereserveAlloc = false;
+        }
+#endif
+#ifndef _CONTROL_FLOW_GUARD
+        allowPrereserveAlloc = false;
+#endif
+        scriptContext->GetThreadContext()->EnsureJITThreadContext(allowPrereserveAlloc);
+
         // batch send all new property records
         ThreadContext::PropertyList * pendingProps = scriptContext->GetThreadContext()->GetPendingJITProperties();
         if (pendingProps->Count() > 0)

diff --git a/lib/Backend/ServerThreadContext.cpp b/lib/Backend/ServerThreadContext.cpp
@@ -20,6 +20,7 @@ ServerThreadContext::ServerThreadContext(ThreadContextDataIDL * data) :
 #endif
     m_jitCRTBaseAddress((intptr_t)GetModuleHandle(UCrtC99MathApis::LibraryName))
 {
+    m_codeGenAlloc.canCreatePreReservedSegment = data->allowPrereserveAlloc != FALSE;
     m_propertyMap = HeapNew(PropertyMap, &HeapAllocator::Instance, TotalNumberOfBuiltInProperties + 700);
 }
 

diff --git a/lib/JITIDL/JITTypes.h b/lib/JITIDL/JITTypes.h
@@ -258,8 +258,8 @@ typedef struct ProfileDataIDL
 typedef struct ThreadContextDataIDL
 {
     boolean isThreadBound;
+    boolean allowPrereserveAlloc;
 
-    IDL_PAD1(0)
     IDL_PAD2(1)
     IDL_PAD4(2)
     CHAKRA_PTR processHandle;

diff --git a/lib/Runtime/Base/ThreadContext.cpp b/lib/Runtime/Base/ThreadContext.cpp
@@ -1955,7 +1955,7 @@ ThreadContext::SetJITConnectionInfo(HANDLE processHandle, void* serverSecurityDe
     }
 }
 void
-ThreadContext::EnsureJITThreadContext()
+ThreadContext::EnsureJITThreadContext(bool allowPrereserveAlloc)
 {
     Assert(JITManager::GetJITManager()->IsOOPJITEnabled());
     Assert(JITManager::GetJITManager()->IsConnected());
@@ -1984,7 +1984,7 @@ ThreadContext::EnsureJITThreadContext()
     contextData.debugScriptIdWhenSetAddr = (intptr_t)this->debugManager->stepController.GetAddressOfScriptIdWhenSet();
     contextData.scriptStackLimit = GetScriptStackLimit();
     contextData.isThreadBound = IsThreadBound();
-
+    contextData.allowPrereserveAlloc = allowPrereserveAlloc;
 #if _M_IX86 || _M_AMD64
     contextData.simdTempAreaBaseAddr = (intptr_t)GetSimdTempArea();
 #endif

diff --git a/lib/Runtime/Base/ThreadContext.h b/lib/Runtime/Base/ThreadContext.h
@@ -545,7 +545,7 @@ class ThreadContext sealed :
     }
 
     static void SetJITConnectionInfo(HANDLE processHandle, void* serverSecurityDescriptor, UUID connectionId);
-    void EnsureJITThreadContext();
+    void EnsureJITThreadContext(bool allowPrereserveAlloc);
 
     intptr_t GetRemoteThreadContextAddr() const
     {