chakrashim: update chakracore to

chakra-core/ChakraCore@0b03604
nodejs · Nov 21, 2016 · ff2d221 · ff2d221
1 parent 9c745fd
commit ff2d221
Show file tree

Hide file tree

Showing 59 changed files with 2,481 additions and 1,895 deletions.
diff --git a/deps/chakrashim/core/lib/Runtime/Base/EtwTrace.cpp b/deps/chakrashim/core/lib/Runtime/Base/EtwTrace.cpp
@@ -147,6 +147,7 @@ void EtwTrace::PerformRundown(bool start)
 
             scriptContext->MapFunction([&start] (FunctionBody* body)
             {
+#if DYNAMIC_INTERPRETER_THUNK
                 if(body->HasInterpreterThunkGenerated())
                 {
                     if(start)
@@ -158,7 +159,9 @@ void EtwTrace::PerformRundown(bool start)
                         LogMethodInterpretedThunkEvent(EventWriteMethodDCEnd, body);
                     }
                 }
+#endif
 
+#if ENABLE_NATIVE_CODEGEN
                 body->MapEntryPoints([&](int index, FunctionEntryPointInfo * entryPoint)
                 {
                     if(entryPoint->IsCodeGenDone())
@@ -191,6 +194,7 @@ void EtwTrace::PerformRundown(bool start)
                         }
                     });
                 });
+#endif
             });
 
             scriptContext = scriptContext->next;
@@ -260,33 +264,57 @@ void EtwTrace::LogSourceUnloadEvents(ScriptContext* scriptContext)
 
 void EtwTrace::LogMethodInterpreterThunkLoadEvent(FunctionBody* body)
 {
+#if DYNAMIC_INTERPRETER_THUNK
     LogMethodInterpretedThunkEvent(EventWriteMethodLoad, body);
+#else
+    Assert(false); // Caller should not be enabled if Dynamic Interpreter Thunks are disabled
+#endif
 }
 
 void EtwTrace::LogMethodNativeLoadEvent(FunctionBody* body, FunctionEntryPointInfo* entryPoint)
 {
+#if ENABLE_NATIVE_CODEGEN
     LogMethodNativeEvent(EventWriteMethodLoad, body, entryPoint);
+#else
+    Assert(false); // Caller should not be enabled if JIT is disabled
+#endif
 }
 
 void EtwTrace::LogLoopBodyLoadEvent(FunctionBody* body, LoopHeader* loopHeader, LoopEntryPointInfo* entryPoint, uint16 loopNumber)
 {
+#if ENABLE_NATIVE_CODEGEN
     LogLoopBodyEventBG(EventWriteMethodLoad, body, loopHeader, entryPoint, loopNumber);
+#else
+    Assert(false); // Caller should not be enabled if JIT is disabled
+#endif
 }
 
 void EtwTrace::LogMethodInterpreterThunkUnloadEvent(FunctionBody* body)
 {
+#if DYNAMIC_INTERPRETER_THUNK
     LogMethodInterpretedThunkEvent(EventWriteMethodUnload, body);
+#else
+Assert(false); // Caller should not be enabled if dynamic interpreter thunks are disabled
+#endif
 }
 
 
 void EtwTrace::LogMethodNativeUnloadEvent(FunctionBody* body, FunctionEntryPointInfo* entryPoint)
 {
+#if ENABLE_NATIVE_CODEGEN
     LogMethodNativeEvent(EventWriteMethodUnload, body, entryPoint);
+#else
+    Assert(false); // Caller should not be enabled if JIT is disabled
+#endif
 }
 
 void EtwTrace::LogLoopBodyUnloadEvent(FunctionBody* body, LoopHeader* loopHeader, LoopEntryPointInfo* entryPoint)
 {
+#if ENABLE_NATIVE_CODEGEN
     LogLoopBodyEvent(EventWriteMethodUnload, body, loopHeader, entryPoint);
+#else
+Assert(false); // Caller should not be enabled if JIT is disabled
+#endif
 }
 
 

diff --git a/deps/chakrashim/core/lib/Runtime/Base/FunctionBody.cpp b/deps/chakrashim/core/lib/Runtime/Base/FunctionBody.cpp
@@ -747,10 +747,10 @@ namespace Js
         return !!pActiveFuncs->TestAndSet(this->GetFunctionNumber());
     }
 
-    void FunctionBody::UpdateActiveFunctionsForOneDataSet(ActiveFunctionSet *pActiveFuncs, FunctionCodeGenRuntimeData **dataSet) const
+    void FunctionBody::UpdateActiveFunctionsForOneDataSet(ActiveFunctionSet *pActiveFuncs, FunctionCodeGenRuntimeData **dataSet, uint count) const
     {
         FunctionCodeGenRuntimeData *inlineeData;
-        for (uint i = 0; i < this->GetProfiledCallSiteCount(); i++)
+        for (uint i = 0; i < count; i++)
         {
             for (inlineeData = dataSet[i]; inlineeData; inlineeData = inlineeData->GetNext())
             {
@@ -762,16 +762,15 @@ namespace Js
     void FunctionBody::UpdateActiveFunctionSet(ActiveFunctionSet *pActiveFuncs, FunctionCodeGenRuntimeData *callSiteData) const
     {
         // Always walk the inlinee and ldFldInlinee data (if we have them), as they are different at each call site.
-
         if (callSiteData)
         {
             if (callSiteData->GetInlinees())
             {
-                this->UpdateActiveFunctionsForOneDataSet(pActiveFuncs, callSiteData->GetInlinees());
+                this->UpdateActiveFunctionsForOneDataSet(pActiveFuncs, callSiteData->GetInlinees(), this->GetProfiledCallSiteCount());
             }
             if (callSiteData->GetLdFldInlinees())
             {
-                this->UpdateActiveFunctionsForOneDataSet(pActiveFuncs, callSiteData->GetLdFldInlinees());
+                this->UpdateActiveFunctionsForOneDataSet(pActiveFuncs, callSiteData->GetLdFldInlinees(), this->GetInlineCacheCount());
             }
         }
 
@@ -782,12 +781,15 @@ namespace Js
             return;
         }
         FunctionCodeGenRuntimeData **data = this->GetCodeGenRuntimeData();
-        if (data == nullptr)
+        if (data != nullptr)
         {
-            return;
+            this->UpdateActiveFunctionsForOneDataSet(pActiveFuncs, data, this->GetProfiledCallSiteCount());
+        }
+        data = this->GetCodeGenGetSetRuntimeData();
+        if (data != nullptr)
+        {
+            this->UpdateActiveFunctionsForOneDataSet(pActiveFuncs, data, this->GetInlineCacheCount());
         }
-
-        this->UpdateActiveFunctionsForOneDataSet(pActiveFuncs, data);
     }
 
     bool FunctionBody::DoRedeferFunction(uint inactiveThreshold) const

diff --git a/deps/chakrashim/core/lib/Runtime/Base/FunctionBody.h b/deps/chakrashim/core/lib/Runtime/Base/FunctionBody.h
@@ -2581,7 +2581,7 @@ namespace Js
         bool IsActiveFunction(ActiveFunctionSet * pActiveFuncs) const;
         bool TestAndUpdateActiveFunctions(ActiveFunctionSet * pActiveFuncs) const;
         void UpdateActiveFunctionSet(ActiveFunctionSet * pActiveFuncs, FunctionCodeGenRuntimeData *callSiteData) const;
-        void UpdateActiveFunctionsForOneDataSet(ActiveFunctionSet *pActiveFuncs, FunctionCodeGenRuntimeData **dataSet) const;
+        void UpdateActiveFunctionsForOneDataSet(ActiveFunctionSet *pActiveFuncs, FunctionCodeGenRuntimeData **dataSet, uint count) const;
         uint GetInactiveCount() const { return inactiveCount; }
         void SetInactiveCount(uint count) { inactiveCount = count; }
         void IncrInactiveCount(uint increment);

diff --git a/deps/chakrashim/core/lib/Runtime/ByteCode/AsmJsByteCodeDumper.cpp b/deps/chakrashim/core/lib/Runtime/ByteCode/AsmJsByteCodeDumper.cpp
@@ -227,6 +227,10 @@ namespace Js
         for (int i = 0; i < WAsmJs::LIMIT; ++i)
         {
             WAsmJs::Types type = (WAsmJs::Types)i;
+            if (func->GetTypedRegisterAllocator().IsTypeExcluded(type))
+            {
+                continue;
+            }
             uint constCount = func->GetTypedRegisterAllocator().GetRegisterSpace(type)->GetConstCount();
             if (constCount > 0)
             {

diff --git a/deps/chakrashim/core/lib/Runtime/Library/CMakeLists.txt b/deps/chakrashim/core/lib/Runtime/Library/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(BuildJIT)
-    add_definitions(-D_ENABLE_ASM_JS=1)
+    add_definitions(-D_ENABLE_DYNAMIC_THUNKS=1)
 endif()
 
 set(CRLIB_SOURCE_CODES

diff --git a/deps/chakrashim/core/lib/Runtime/Library/Chakra.Runtime.Library.vcxproj b/deps/chakrashim/core/lib/Runtime/Library/Chakra.Runtime.Library.vcxproj
@@ -297,7 +297,7 @@
   </ItemGroup>
   <ItemGroup>
     <MASM Include="$(MSBuildThisFileDirectory)amd64\JavascriptFunctionA.asm">
-      <PreprocessorDefinitions Condition="'$(BuildJIT)'!='false'">%(PreprocessorDefinitions);_ENABLE_ASM_JS=1</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(BuildJIT)'!='false'">%(PreprocessorDefinitions);_ENABLE_DYNAMIC_THUNKS=1</PreprocessorDefinitions>
       <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
     </MASM>
     <ARMASM Include="$(MSBuildThisFileDirectory)arm\arm_DeferredDeserializeThunk.asm">