[1.10>master] [MERGE chakra-core#5554 @atulkatti] MSFT:18321215 Unroot the temporary guest arena created by parser before releasing it to the ThreadContext.

Atul Katti · Atul Katti · commit 97caf125f156 · 2018-07-31T11:50:11.000-07:00
Merge pull request chakra-core#5554 from atulkatti:Bug18321215.UnrootParserGuestArena.1
diff --git a/lib/Parser/Parse.cpp b/lib/Parser/Parse.cpp
@@ -13995,6 +13995,7 @@ void Parser::ReleaseTemporaryGuestArena()
         if (this->m_scriptContext != nullptr)
         {
             this->m_scriptContext->ReleaseTemporaryGuestAllocator(m_tempGuestArena);
+            m_tempGuestArena.Unroot();
         }
 
         m_tempGuestArenaReleased = true;
diff --git a/lib/Runtime/Base/ScriptContext.h b/lib/Runtime/Base/ScriptContext.h
@@ -2034,16 +2034,10 @@ namespace Js
     ArenaAllocator * allocator = nullptr;
 
 #define ACQUIRE_TEMP_GUEST_ALLOCATOR(allocator, scriptContext, name) \
-    TryFinally([&]() \
-    { \
-        tempGuest##allocator = scriptContext->GetTemporaryGuestAllocator(name); \
-        allocator = tempGuest##allocator->GetAllocator();
+    tempGuest##allocator = scriptContext->GetTemporaryGuestAllocator(name); \
+    allocator = tempGuest##allocator->GetAllocator();
 
 #define RELEASE_TEMP_GUEST_ALLOCATOR(allocator, scriptContext) \
-    }, \
-    [&](bool /*hasException*/) \
-    { \
-        if (tempGuest##allocator) \
-        scriptContext->ReleaseTemporaryGuestAllocator(tempGuest##allocator); \
-    });
+    if (tempGuest##allocator) \
+    scriptContext->ReleaseTemporaryGuestAllocator(tempGuest##allocator);
 
diff --git a/test/Array/rlexe.xml b/test/Array/rlexe.xml
@@ -646,6 +646,7 @@
       <files>memset_invariant.js</files>
       <tags>Slow</tags>
       <compile-flags>-mic:1 -off:simplejit -mmoc:0 -off:JITLoopBody</compile-flags>
+      <timeout>300</timeout>
     </default>
   </test>
   <!--

Original file line number	Diff line number	Diff line change
`@@ -13995,6 +13995,7 @@ void Parser::ReleaseTemporaryGuestArena()`
`13995`	`13995`	`if (this->m_scriptContext != nullptr)`
`13996`	`13996`	`{`
`13997`	`13997`	`this->m_scriptContext->ReleaseTemporaryGuestAllocator(m_tempGuestArena);`
	`13998`	`+ m_tempGuestArena.Unroot();`
`13998`	`13999`	`}`
`13999`	`14000`
`14000`	`14001`	`m_tempGuestArenaReleased = true;`