[MERGE chakra-core#2426 @atulkatti] OOPJIT: Avoid attempting to initialize script context if JIT server process has terminated.

Atul Katti · Atul Katti · commit 08df52ccfd50 · 2017-01-27T17:27:20.000-08:00
Merge pull request chakra-core#2426 from atulkatti:Bug10152976.JitClientAssert
diff --git a/lib/Runtime/Base/ScriptContext.cpp b/lib/Runtime/Base/ScriptContext.cpp
@@ -4566,10 +4566,12 @@ void ScriptContext::RegisterPrototypeChainEnsuredToHaveOnlyWritableDataPropertie
 #ifndef _CONTROL_FLOW_GUARD
         allowPrereserveAlloc = false;
 #endif
-        this->GetThreadContext()->EnsureJITThreadContext(allowPrereserveAlloc);
-
-        HRESULT hr = JITManager::GetJITManager()->InitializeScriptContext(&contextData, this->GetThreadContext()->GetRemoteThreadContextAddr(), &m_remoteScriptContextAddr);
-        JITManager::HandleServerCallResult(hr, RemoteCallType::StateUpdate);
+        // The EnsureJITThreadContext() call could fail if the JIT Server process has died. In such cases, we should not try to do anything further in the client process.
+        if (this->GetThreadContext()->EnsureJITThreadContext(allowPrereserveAlloc))
+        {
+            HRESULT hr = JITManager::GetJITManager()->InitializeScriptContext(&contextData, this->GetThreadContext()->GetRemoteThreadContextAddr(), &m_remoteScriptContextAddr);
+            JITManager::HandleServerCallResult(hr, RemoteCallType::StateUpdate);
+        }
     }
 #endif
 
diff --git a/lib/Runtime/Base/ThreadContext.cpp b/lib/Runtime/Base/ThreadContext.cpp
@@ -1943,19 +1943,19 @@ ThreadContext::SetJITConnectionInfo(HANDLE processHandle, void* serverSecurityDe
         JITManager::GetJITManager()->ConnectRpcServer(processHandle, serverSecurityDescriptor, connectionId);
     }
 }
-void
+bool
 ThreadContext::EnsureJITThreadContext(bool allowPrereserveAlloc)
 {
 #if ENABLE_OOP_NATIVE_CODEGEN
     Assert(JITManager::GetJITManager()->IsOOPJITEnabled());
     if (!JITManager::GetJITManager()->IsConnected())
     {
-        return;
+        return false;
     }
 
     if (m_remoteThreadContextInfo)
     {
-        return;
+        return true;
     }
 
     ThreadContextDataIDL contextData;
@@ -1964,7 +1964,7 @@ ThreadContext::EnsureJITThreadContext(bool allowPrereserveAlloc)
     HANDLE jitTargetHandle = nullptr;
     if (!DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(), serverHandle, &jitTargetHandle, 0, FALSE, DUPLICATE_SAME_ACCESS))
     {
-        return;
+        return false;
     }
 
     contextData.processHandle = (intptr_t)jitTargetHandle;
@@ -1996,6 +1996,7 @@ ThreadContext::EnsureJITThreadContext(bool allowPrereserveAlloc)
     HRESULT hr = JITManager::GetJITManager()->InitializeThreadContext(&contextData, &m_remoteThreadContextInfo, &m_prereservedRegionAddr);
     JITManager::HandleServerCallResult(hr, RemoteCallType::StateUpdate);
 
+    return m_remoteThreadContextInfo != nullptr;
 #endif
 }
 #endif
diff --git a/lib/Runtime/Base/ThreadContext.h b/lib/Runtime/Base/ThreadContext.h
@@ -503,7 +503,7 @@ class ThreadContext sealed :
     }
 
     static void SetJITConnectionInfo(HANDLE processHandle, void* serverSecurityDescriptor, UUID connectionId);
-    void EnsureJITThreadContext(bool allowPrereserveAlloc);
+    bool EnsureJITThreadContext(bool allowPrereserveAlloc);
 
     PTHREADCONTEXT_HANDLE GetRemoteThreadContextAddr()
     {

Original file line number	Diff line number	Diff line change
`@@ -1943,19 +1943,19 @@ ThreadContext::SetJITConnectionInfo(HANDLE processHandle, void* serverSecurityDe`
`1943`	`1943`	`JITManager::GetJITManager()->ConnectRpcServer(processHandle, serverSecurityDescriptor, connectionId);`
`1944`	`1944`	`}`
`1945`	`1945`	`}`
`1946`		`-void`
	`1946`	`+bool`
`1947`	`1947`	`ThreadContext::EnsureJITThreadContext(bool allowPrereserveAlloc)`
`1948`	`1948`	`{`
`1949`	`1949`	`#if ENABLE_OOP_NATIVE_CODEGEN`
`1950`	`1950`	`Assert(JITManager::GetJITManager()->IsOOPJITEnabled());`
`1951`	`1951`	`if (!JITManager::GetJITManager()->IsConnected())`
`1952`	`1952`	`{`
`1953`		`- return;`
	`1953`	`+ return false;`
`1954`	`1954`	`}`
`1955`	`1955`
`1956`	`1956`	`if (m_remoteThreadContextInfo)`
`1957`	`1957`	`{`
`1958`		`- return;`
	`1958`	`+ return true;`
`1959`	`1959`	`}`
`1960`	`1960`
`1961`	`1961`	`ThreadContextDataIDL contextData;`
`@@ -1964,7 +1964,7 @@ ThreadContext::EnsureJITThreadContext(bool allowPrereserveAlloc)`
`1964`	`1964`	`HANDLE jitTargetHandle = nullptr;`
`1965`	`1965`	`if (!DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(), serverHandle, &jitTargetHandle, 0, FALSE, DUPLICATE_SAME_ACCESS))`
`1966`	`1966`	`{`
`1967`		`- return;`
	`1967`	`+ return false;`
`1968`	`1968`	`}`
`1969`	`1969`
`1970`	`1970`	`contextData.processHandle = (intptr_t)jitTargetHandle;`
`@@ -1996,6 +1996,7 @@ ThreadContext::EnsureJITThreadContext(bool allowPrereserveAlloc)`
`1996`	`1996`	`HRESULT hr = JITManager::GetJITManager()->InitializeThreadContext(&contextData, &m_remoteThreadContextInfo, &m_prereservedRegionAddr);`
`1997`	`1997`	`JITManager::HandleServerCallResult(hr, RemoteCallType::StateUpdate);`
`1998`	`1998`
	`1999`	`+ return m_remoteThreadContextInfo != nullptr;`
`1999`	`2000`	`#endif`
`2000`	`2001`	`}`
`2001`	`2002`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ class ThreadContext sealed :`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`static void SetJITConnectionInfo(HANDLE processHandle, void* serverSecurityDescriptor, UUID connectionId);`
`506`		`- void EnsureJITThreadContext(bool allowPrereserveAlloc);`
	`506`	`+ bool EnsureJITThreadContext(bool allowPrereserveAlloc);`
`507`	`507`
`508`	`508`	`PTHREADCONTEXT_HANDLE GetRemoteThreadContextAddr()`
`509`	`509`	`{`