CR fixes

Cellule · Cellule · commit 58232f9c1c62 · 2017-12-18T17:58:38.000-08:00
diff --git a/lib/Common/ConfigFlagsList.h b/lib/Common/ConfigFlagsList.h
@@ -539,7 +539,7 @@ PHASE(All)
 #else
     #define DEFAULT_CONFIG_JsBuiltIn             (false)
 #endif
-
+#define DEFAULT_CONFIG_JitRepro                (false)
 #define DEFAULT_CONFIG_LdChakraLib             (false)
 
 // ES6 DEFAULT BEHAVIOR
@@ -1008,6 +1008,7 @@ FLAGR (Boolean, Intl                  , "Intl object support", DEFAULT_CONFIG_In
 FLAGNR(Boolean, IntlBuiltIns          , "Intl built-in function support", DEFAULT_CONFIG_IntlBuiltIns)
 
 FLAGNR(Boolean, JsBuiltIn             , "JS Built-in function support", DEFAULT_CONFIG_JsBuiltIn)
+FLAGNR(Boolean, JitRepro              , "Add Function.invokeJit to execute codegen on an encoded rpc buffer", DEFAULT_CONFIG_JitRepro)
 
 FLAGNR(Boolean, LdChakraLib           , "Access to the Chakra internal library with the __chakraLibrary keyword", DEFAULT_CONFIG_LdChakraLib)
 // ES6 (BLUE+1) features/flags
diff --git a/lib/JITClient/JITManager.cpp b/lib/JITClient/JITManager.cpp
@@ -758,7 +758,12 @@ JITManager::SerializeRPCData(_In_ CodeGenWorkItemIDL *workItemData, _Out_ size_t
             // Calculate how big we need to create the buffer
             size_t tmpBufSize = pCodeGenWorkItemIDL_AlignSize(marshalHandle, &workItemData);
             size_t alignedBufSize = Math::Align<size_t>(tmpBufSize, 16);
-            data = new char[alignedBufSize];
+            data = HeapNewNoThrowArray(char, alignedBufSize);
+            if (!data)
+            {
+                // Ran out of memory
+                return E_OUTOFMEMORY;
+            }
 
             // Reset the buffer handle to a fixed buffer
             status = MesBufferHandleReset(
diff --git a/lib/JITServer/JITServer.cpp b/lib/JITServer/JITServer.cpp
@@ -764,8 +764,11 @@ ServerRemoteCodeGen(
     struct AutoFreeArray
     {
         const byte* arr = nullptr;
-        ~AutoFreeArray() { delete[] arr; }
-    } autoFreeArray = { serializedRpcData };
+        size_t bufferSize = 0;
+        ~AutoFreeArray() { HeapDeleteArray(bufferSize, arr); }
+    } autoFreeArray;
+    autoFreeArray.arr = serializedRpcData;
+    autoFreeArray.bufferSize = serializedRpcDataSize;
 #endif
 
     return ServerCallWrapper(scriptContextInfo, [&]() ->HRESULT
diff --git a/lib/Runtime/Library/JavascriptLibrary.cpp b/lib/Runtime/Library/JavascriptLibrary.cpp
@@ -2758,7 +2758,10 @@ namespace Js
         functionConstructor->SetHasNoEnumerableProperties(true);
 
 #ifdef ALLOW_JIT_REPRO
-        library->AddFunctionToLibraryObject(functionConstructor, PropertyIds::invokeJit, &JavascriptFunction::EntryInfo::InvokeJit, 1);
+        if (CONFIG_FLAG(JitRepro))
+        {
+            library->AddFunctionToLibraryObject(functionConstructor, PropertyIds::invokeJit, &JavascriptFunction::EntryInfo::InvokeJit, 1);
+        }
 #endif
 
         return true;
