[Merge chakra-core/ChakraCore@ad54488def] [1.6>1.7] [MERGE #3411 @aga…

…rwal-sandeep] Fix -stats:rejit for chakra full Merge pull request #3411 from agarwal-sandeep:fixstatsrejit
nodejs · Jul 22, 2017 · 4c77b78 · 4c77b78
1 parent 79c597e
commit 4c77b78
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/deps/chakrashim/core/lib/Runtime/Base/ScriptContext.cpp b/deps/chakrashim/core/lib/Runtime/Base/ScriptContext.cpp
@@ -5559,6 +5559,9 @@ void ScriptContext::RegisterPrototypeChainEnsuredToHaveOnlyWritableDataPropertie
 
             }
         }
+
+        this->ClearBailoutReasonCountsMap();
+        this->ClearRejitReasonCountsArray();
 #endif
 
 #ifdef FIELD_ACCESS_STATS
@@ -5731,6 +5734,34 @@ void ScriptContext::RegisterPrototypeChainEnsuredToHaveOnlyWritableDataPropertie
         }
 #endif
     }
+    void ScriptContext::ClearBailoutReasonCountsMap()
+    {
+        if (this->bailoutReasonCounts != nullptr)
+        {
+            this->bailoutReasonCounts->Clear();
+        }
+        if (this->bailoutReasonCountsCap != nullptr)
+        {
+            this->bailoutReasonCountsCap->Clear();
+        }
+    }
+    void ScriptContext::ClearRejitReasonCountsArray()
+    {
+        if (this->rejitReasonCounts != nullptr)
+        {
+            for (UINT16 i = 0; i < NumRejitReasons; i++)
+            {
+                this->rejitReasonCounts[i] = 0;
+            }
+        }
+        if (this->rejitReasonCountsCap != nullptr)
+        {
+            for (UINT16 i = 0; i < NumRejitReasons; i++)
+            {
+                this->rejitReasonCountsCap[i] = 0;
+            }
+        }
+    }
 #endif
 
 #ifdef ENABLE_BASIC_TELEMETRY

diff --git a/deps/chakrashim/core/lib/Runtime/Base/ScriptContext.h b/deps/chakrashim/core/lib/Runtime/Base/ScriptContext.h
@@ -711,6 +711,8 @@ namespace Js
         BailoutStatsMap *bailoutReasonCountsCap;
         uint *rejitReasonCounts;
         uint *rejitReasonCountsCap;
+        void ClearBailoutReasonCountsMap();
+        void ClearRejitReasonCountsArray();
 #endif
 #ifdef ENABLE_BASIC_TELEMETRY