[1.8>1.9] [MERGE #4684 @MikeHolman] fix assert in JIT data serialization

MikeHolman · MikeHolman · commit c80612854714 · 2018-02-15T13:37:44.000-08:00
Merge pull request #4684 from MikeHolman:serializedassert We may have multiple codegen calls for same entrypoint, so replace the old JIT data if this happens OS: 15845157
diff --git a/lib/Runtime/Base/FunctionBody.h b/lib/Runtime/Base/FunctionBody.h
@@ -437,7 +437,12 @@ namespace Js
     public:
         void SetSerializedRpcData(const unsigned char* data, size_t size)
         {
-            Assert(serializedRpcData == nullptr);
+            if (this->serializedRpcData != nullptr)
+            {
+                // We may have multiple codegens happen for same entrypoint
+                const unsigned char* rpcData = this->serializedRpcData;
+                HeapDeleteArray(this->serializedRpcDataSize, rpcData);
+            }
             serializedRpcData = data;
             serializedRpcDataSize = size;
         }

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,12 @@ namespace Js`
`437`	`437`	`public:`
`438`	`438`	`void SetSerializedRpcData(const unsigned char* data, size_t size)`
`439`	`439`	`{`
`440`		`- Assert(serializedRpcData == nullptr);`
	`440`	`+ if (this->serializedRpcData != nullptr)`
	`441`	`+ {`
	`442`	`+ // We may have multiple codegens happen for same entrypoint`
	`443`	`+ const unsigned char* rpcData = this->serializedRpcData;`
	`444`	`+ HeapDeleteArray(this->serializedRpcDataSize, rpcData);`
	`445`	`+ }`
`441`	`446`	`serializedRpcData = data;`
`442`	`447`	`serializedRpcDataSize = size;`
`443`	`448`	`}`