deps: update ChakraCore to chakra-core/ChakraCore@2bd57e547a

[MERGE #5454 @atulkatti] MSFT:16597129 Relax assert in TypePropertyCache::TryGetProperty for cases where implicit calls may be disabled. Merge pull request #5454 from atulkatti:Bug16597129.TypePropertyCache.CEO.1 Reviewed-By: chakrabot <[email protected]>
nodejs · Jul 18, 2018 · 5a5a284 · 5a5a284
1 parent 9c6af75
commit 5a5a284
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/deps/chakrashim/core/lib/Runtime/Language/InlineCache.h b/deps/chakrashim/core/lib/Runtime/Language/InlineCache.h
@@ -458,8 +458,11 @@ namespace Js
                 ScriptContext *const requestContext)
             {
                 *propertyValue = InlineCache::GetPropertyValue<slotType>(cache->GetSourceObject<cacheType>(propertyObject), cache->GetSlotIndex<cacheType>());
-                Assert(*propertyValue == JavascriptOperators::GetProperty(propertyObject, propertyId, requestContext) ||
-                    (RootObjectBase::Is(propertyObject) && *propertyValue == JavascriptOperators::GetRootProperty(propertyObject, propertyId, requestContext)));
+                DebugOnly(Var getPropertyValue = JavascriptOperators::GetProperty(propertyObject, propertyId, requestContext));
+                Assert(*propertyValue == getPropertyValue ||
+                    (RootObjectBase::Is(propertyObject) && *propertyValue == JavascriptOperators::GetRootProperty(propertyObject, propertyId, requestContext))||
+                    // In some cases, such as CustomExternalObject, if implicit calls are disabled GetPropertyQuery may return null. See CustomExternalObject::GetPropertyQuery for an example.
+                    (getPropertyValue == requestContext->GetLibrary()->GetNull() && requestContext->GetThreadContext()->IsDisableImplicitCall() && propertyObject->GetType()->IsExternal()));
             }
         };
     };

diff --git a/deps/chakrashim/core/lib/Runtime/Types/TypePropertyCache.cpp b/deps/chakrashim/core/lib/Runtime/Types/TypePropertyCache.cpp
@@ -300,7 +300,10 @@ namespace Js
         {
             if (!OutputExistence)
             {
-                Assert(*propertyValue == JavascriptOperators::GetProperty(propertyObject, propertyId, requestContext));
+                DebugOnly(Var getPropertyValue = JavascriptOperators::GetProperty(propertyObject, propertyId, requestContext));
+                Assert(*propertyValue == getPropertyValue ||
+                    // In some cases, such as CustomExternalObject, if implicit calls are disabled GetPropertyQuery may return null. See CustomExternalObject::GetPropertyQuery for an example.
+                    (getPropertyValue == requestContext->GetLibrary()->GetNull() && requestContext->GetThreadContext()->IsDisableImplicitCall() && propertyObject->GetType()->IsExternal()));
             }
 
             if(propertyObject->GetScriptContext() != requestContext)