[1.10>master] [MERGE #5554 @atulkatti] MSFT:18321215 Unroot the tempo…

…rary guest arena created by parser before releasing it to the ThreadContext. Merge pull request #5554 from atulkatti:Bug18321215.UnrootParserGuestArena.1
chakra-core · Jul 31, 2018 · 97caf12 · 97caf12
2 parents 0728265 + 80b8dde
commit 97caf12
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
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>
   <!--