[MERGE chakra-core#2345 @pleath] Fix leak in deferred function dictionary.

pleath · pleath · commit 5d9e5a938108 · 2017-01-10T14:28:14.000-08:00
Merge pull request chakra-core#2345 from pleath:deferreddictionary Now that the deferred function dictionary is leaf memory, we need to remove ParseableFunctionInfo's from it as they are undeferred.
diff --git a/lib/Runtime/Base/FunctionBody.cpp b/lib/Runtime/Base/FunctionBody.cpp
@@ -2145,6 +2145,7 @@ namespace Js
         // - This is an already parsed asm.js module, which has been invalidated at link time and must be reparsed as a non-asm.js function
         if (!this->m_hasBeenParsed)
         {
+            this->GetUtf8SourceInfo()->StopTrackingDeferredFunction(this->GetLocalFunctionId());
             funcBody = FunctionBody::NewFromParseableFunctionInfo(this);
             autoRestoreFunctionInfo.funcBody = funcBody;
 
diff --git a/lib/Runtime/ByteCode/ByteCodeGenerator.cpp b/lib/Runtime/ByteCode/ByteCodeGenerator.cpp
@@ -1282,6 +1282,7 @@ FuncInfo * ByteCodeGenerator::StartBindFunction(const char16 *name, uint nameLen
             {
                 if (!reuseNestedFunc->IsFunctionBody())
                 {
+                    reuseNestedFunc->GetUtf8SourceInfo()->StopTrackingDeferredFunction(reuseNestedFunc->GetLocalFunctionId());
                     Js::FunctionBody * parsedFunctionBody =
                         Js::FunctionBody::NewFromParseableFunctionInfo(reuseNestedFunc->GetParseableFunctionInfo());
                     autoRestoreFunctionInfo.funcBody = parsedFunctionBody;

Original file line number	Diff line number	Diff line change
`@@ -2145,6 +2145,7 @@ namespace Js`
`2145`	`2145`	`// - This is an already parsed asm.js module, which has been invalidated at link time and must be reparsed as a non-asm.js function`
`2146`	`2146`	`if (!this->m_hasBeenParsed)`
`2147`	`2147`	`{`
	`2148`	`+ this->GetUtf8SourceInfo()->StopTrackingDeferredFunction(this->GetLocalFunctionId());`
`2148`	`2149`	`funcBody = FunctionBody::NewFromParseableFunctionInfo(this);`
`2149`	`2150`	`autoRestoreFunctionInfo.funcBody = funcBody;`
`2150`	`2151`
Original file line number	Diff line number	Diff line change
`@@ -1282,6 +1282,7 @@ FuncInfo * ByteCodeGenerator::StartBindFunction(const char16 *name, uint nameLen`
`1282`	`1282`	`{`
`1283`	`1283`	`if (!reuseNestedFunc->IsFunctionBody())`
`1284`	`1284`	`{`
	`1285`	`+ reuseNestedFunc->GetUtf8SourceInfo()->StopTrackingDeferredFunction(reuseNestedFunc->GetLocalFunctionId());`
`1285`	`1286`	`Js::FunctionBody * parsedFunctionBody =`
`1286`	`1287`	`Js::FunctionBody::NewFromParseableFunctionInfo(reuseNestedFunc->GetParseableFunctionInfo());`
`1287`	`1288`	`autoRestoreFunctionInfo.funcBody = parsedFunctionBody;`