[MERGE chakra-core#843] Fix bug with handling of OOM while processing jit transfer data

rajatd · rajatd · commit 77cbb2f9ba6d · 2016-04-20T17:56:00.000-07:00
Merge pull request chakra-core#843 from rajatd:installGuards We allocate equivalent type caches and register the current entry point info on the thread context as having equivalent type caches. Each of these operations could throw OOM. The resetting of entrypoint's state in the OOM handling code should be agnostic of the success or failure of the aforementioned operations.
diff --git a/lib/Runtime/Base/FunctionBody.cpp b/lib/Runtime/Base/FunctionBody.cpp
@@ -8215,12 +8215,9 @@ namespace Js
         // corresponding fields on the entryPointInfo should be rolled back here.
         this->runtimeTypeRefs = nullptr;
         this->FreePropertyGuards();
-        if (this->equivalentTypeCaches != nullptr)
-        {
-            this->equivalentTypeCacheCount = 0;
-            this->equivalentTypeCaches = nullptr;
-            this->UnregisterEquivalentTypeCaches();
-        }
+        this->equivalentTypeCacheCount = 0;
+        this->equivalentTypeCaches = nullptr;
+        this->UnregisterEquivalentTypeCaches();
 
         this->ResetOnNativeCodeInstallFailure();
     }
