deps: update ChakraCore to chakra-core/ChakraCore@e93b29b80d

obastemur · chakrabot · commit 2fd042513039 · 2018-02-01T03:07:37.000-08:00
[MERGE #3717 @obastemur] remove old interceptors code and open a space under TypeFlagMask Merge pull request #3717 from obastemur:rem_inter CanHaveInterceptors was being triggered heavily on some of the benchmarks and looking deeper shown that there is no reason keeping this code around. Besides.. Removing this, comes with a very useful space within `TypeFlagMask` that I could use for ExternalData support. So.. unless someone comes and say that this particular mask is in use at some place (which I could not find), I will update the external data PR too. Reminder: Both TypeFlagMask_External and TypeFlagMask_CanHaveInterceptors are set at the same place in full code. There is no place that they were being set separately. Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>
diff --git a/deps/chakrashim/core/lib/Runtime/Debug/DiagObjectModel.cpp b/deps/chakrashim/core/lib/Runtime/Debug/DiagObjectModel.cpp
@@ -2141,7 +2141,7 @@ namespace Js
                     auto funcPtr = [&]()
                     {
                         IGNORE_STACKWALK_EXCEPTION(scriptContext);
-                        if (object->CanHaveInterceptors())
+                        if (object->IsExternal())
                         {
                             Js::ForInObjectEnumerator enumerator(object, object->GetScriptContext(), /* enumSymbols */ true);
                             Js::PropertyId propertyId;
@@ -2461,7 +2461,7 @@ namespace Js
 
                 if (JavascriptOperators::IsObject(object))
                 {
-                    if (object->CanHaveInterceptors() || JavascriptOperators::GetTypeId(object) == TypeIds_Proxy)
+                    if (object->IsExternal() || JavascriptOperators::GetTypeId(object) == TypeIds_Proxy)
                     {
                         try
                         {
diff --git a/deps/chakrashim/core/lib/Runtime/Debug/TTSnapObjects.cpp b/deps/chakrashim/core/lib/Runtime/Debug/TTSnapObjects.cpp
@@ -15,7 +15,7 @@ namespace TTD
     {
         void ExtractCompoundObject(NSSnapObjects::SnapObject* sobj, Js::RecyclableObject* obj, bool isWellKnown, const TTDIdentifierDictionary<TTD_PTR_ID, NSSnapType::SnapType*>& idToTypeMap, SlabAllocator& alloc)
         {
-            TTDAssert(!obj->CanHaveInterceptors(), "We are not prepared for custom external objects yet");
+            TTDAssert(!obj->IsExternal(), "We are not prepared for custom external objects yet");
 
             sobj->ObjectPtrId = TTD_CONVERT_VAR_TO_PTR_ID(obj);
             sobj->SnapObjectTag = obj->GetSnapTag_TTD();
diff --git a/deps/chakrashim/core/lib/Runtime/Debug/TTSnapshotExtractor.cpp b/deps/chakrashim/core/lib/Runtime/Debug/TTSnapshotExtractor.cpp
@@ -247,7 +247,7 @@ namespace TTD
     void SnapshotExtractor::MarkVisitVar(Js::Var var)
     {
         TTDAssert(var != nullptr, "I don't think this should happen but not 100% sure.");
-        TTDAssert(Js::JavascriptOperators::GetTypeId(var) < Js::TypeIds_Limit || Js::RecyclableObject::FromVar(var)->CanHaveInterceptors(), "Not cool.");
+        TTDAssert(Js::JavascriptOperators::GetTypeId(var) < Js::TypeIds_Limit || Js::RecyclableObject::FromVar(var)->IsExternal(), "Not cool.");
 
         //We don't need to visit tagged things
         if(JsSupport::IsVarTaggedInline(var))
diff --git a/deps/chakrashim/core/lib/Runtime/Language/JavascriptOperators.cpp b/deps/chakrashim/core/lib/Runtime/Language/JavascriptOperators.cpp
@@ -1045,7 +1045,7 @@ namespace Js
 #endif
         }
 
-        if (RecyclableObject::FromVar(aLeft)->CanHaveInterceptors())
+        if (RecyclableObject::FromVar(aLeft)->IsExternal())
         {
             BOOL result;
             if (RecyclableObject::FromVar(aLeft)->StrictEquals(aRight, &result, requestContext))
@@ -1057,7 +1057,7 @@ namespace Js
             }
         }
 
-        if (!TaggedNumber::Is(aRight) && RecyclableObject::FromVar(aRight)->CanHaveInterceptors())
+        if (!TaggedNumber::Is(aRight) && RecyclableObject::FromVar(aRight)->IsExternal())
         {
             BOOL result;
             if (RecyclableObject::FromVar(aRight)->StrictEquals(aLeft, &result, requestContext))
@@ -2356,7 +2356,7 @@ namespace Js
             // in 9.1.9, step 5, we should return false if receiver is not object, and that will happen in default RecyclableObject operation anyhow.
             if (receiverObject->SetProperty(propertyKey, newValue, propertyOperationFlags, info))
             {
-                if (!JavascriptProxy::Is(receiver) && info->GetPropertyString() && info->GetFlags() != InlineCacheSetterFlag && !object->CanHaveInterceptors())
+                if (!JavascriptProxy::Is(receiver) && info->GetPropertyString() && info->GetFlags() != InlineCacheSetterFlag && !object->IsExternal())
                 {
                     CacheOperators::CachePropertyWrite(RecyclableObject::FromVar(receiver), false, typeWithoutProperty, info->GetPropertyString()->GetPropertyId(), info, requestContext);
 
@@ -8276,7 +8276,7 @@ namespace Js
                         // It is valid for some objects to not-support getters and setters, specifically, for projection of an ABI method
                         // (CustomExternalObject => MapWithStringKey) which SetAccessors returns VBSErr_ActionNotSupported.
                         // But for non-external objects SetAccessors should succeed.
-                        Assert(isSetAccessorsSuccess || obj->CanHaveInterceptors());
+                        Assert(isSetAccessorsSuccess || obj->IsExternal());
 
                         // If SetAccessors failed, the property wasn't created, so no need to change the attributes.
                         if (isSetAccessorsSuccess)
@@ -8354,7 +8354,7 @@ namespace Js
                         // It is valid for some objects to not-support getters and setters, specifically, for projection of an ABI method
                         // (CustomExternalObject => MapWithStringKey) which SetAccessors returns VBSErr_ActionNotSupported.
                         // But for non-external objects SetAccessors should succeed.
-                        Assert(isSetAccessorsSuccess || obj->CanHaveInterceptors());
+                        Assert(isSetAccessorsSuccess || obj->IsExternal());
 
                         if (isSetAccessorsSuccess)
                         {
diff --git a/deps/chakrashim/core/lib/Runtime/Language/JavascriptOperators.inl b/deps/chakrashim/core/lib/Runtime/Language/JavascriptOperators.inl
@@ -11,10 +11,7 @@ namespace Js
         AssertMsg(obj != nullptr, "GetTypeId aValue is null");
 
         auto typeId = obj->GetTypeId();
-#if DBG
-        auto isExternal = obj->CanHaveInterceptors();
-        AssertMsg(typeId < TypeIds_Limit || isExternal, "GetTypeId aValue has invalid TypeId");
-#endif
+        AssertMsg(typeId < TypeIds_Limit || obj->IsExternal(), "GetTypeId aValue has invalid TypeId");
         return typeId;
     }
 
diff --git a/deps/chakrashim/core/lib/Runtime/Library/JavascriptObject.cpp b/deps/chakrashim/core/lib/Runtime/Library/JavascriptObject.cpp
@@ -635,7 +635,7 @@ namespace Js
     BOOL JavascriptObject::GetOwnPropertyDescriptorHelper(RecyclableObject* obj, PropertyId propertyId, ScriptContext* scriptContext, PropertyDescriptor& propertyDescriptor)
     {
         BOOL isPropertyDescriptorDefined;
-        if (obj->CanHaveInterceptors())
+        if (obj->IsExternal())
         {
             isPropertyDescriptorDefined = obj->HasOwnProperty(propertyId) ?
                 JavascriptOperators::GetOwnPropertyDescriptor(obj, propertyId, scriptContext, &propertyDescriptor) : obj->GetDefaultPropertyDescriptor(propertyDescriptor);
diff --git a/deps/chakrashim/core/lib/Runtime/Types/RecyclableObject.h b/deps/chakrashim/core/lib/Runtime/Types/RecyclableObject.h
@@ -336,7 +336,6 @@ namespace Js {
         virtual BOOL HasInstance(Var instance, ScriptContext* scriptContext, IsInstInlineCache* inlineCache = NULL);
 
         BOOL SkipsPrototype() const;
-        BOOL CanHaveInterceptors() const;
         BOOL IsExternal() const;
         // Used only in JsVarToExtension where it may be during dispose and the type is not available
         virtual BOOL IsExternalVirtual() const { return FALSE; }
@@ -402,7 +401,6 @@ namespace Js {
         // Used to Assert that the object may safely be cast to a DynamicObject
         virtual bool DbgIsDynamicObject() const { return false; }
         virtual BOOL DbgSkipsPrototype() const { return FALSE; }
-        virtual BOOL DbgCanHaveInterceptors() const { return false; }
 #endif
 #if defined(PROFILE_RECYCLER_ALLOC) && defined(RECYCLER_DUMP_OBJECT_GRAPH)
     public:
diff --git a/deps/chakrashim/core/lib/Runtime/Types/RecyclableObject.inl b/deps/chakrashim/core/lib/Runtime/Types/RecyclableObject.inl
@@ -56,14 +56,6 @@ namespace Js
         return this->GetLibrary()->GetScriptContext();
     }
 
-    inline BOOL RecyclableObject::CanHaveInterceptors() const
-    {
-#if !defined(USED_IN_STATIC_LIB)
-        Assert(this->DbgCanHaveInterceptors() == this->GetType()->CanHaveInterceptors());
-#endif
-        return this->GetType()->CanHaveInterceptors();
-    }
-
     inline BOOL RecyclableObject::HasItem(uint32 index)
     {
         return JavascriptConversion::PropertyQueryFlagsToBoolean(HasItemQuery(index));
diff --git a/deps/chakrashim/core/lib/Runtime/Types/Type.h b/deps/chakrashim/core/lib/Runtime/Types/Type.h
@@ -10,9 +10,9 @@ enum TypeFlagMask : uint8
     TypeFlagMask_AreThisAndPrototypesEnsuredToHaveOnlyWritableDataProperties       = 0x01,
     TypeFlagMask_IsFalsy                                                           = 0x02,
     TypeFlagMask_HasSpecialPrototype                                               = 0x04,
-    TypeFlagMask_External                                                          = 0x08,
+    TypeFlagMask_EngineExternal                                                    = 0x08,
     TypeFlagMask_SkipsPrototype                                                    = 0x10,
-    TypeFlagMask_CanHaveInterceptors                                               = 0x20,
+    TypeFlagMask_RESERVED                                                          = 0x20,
     TypeFlagMask_JsrtExternal                                                      = 0x40,
     TypeFlagMask_HasBeenCached                                                     = 0x80
 };
@@ -60,10 +60,17 @@ namespace Js
         BOOL AreThisAndPrototypesEnsuredToHaveOnlyWritableDataProperties() const;
         void SetAreThisAndPrototypesEnsuredToHaveOnlyWritableDataProperties(const bool truth);
 
-        inline BOOL IsExternal() const { return (this->flags & TypeFlagMask_External) != 0; }
+        inline BOOL IsExternal() const
+        {
+#ifdef NTBUILD
+            return (this->flags & TypeFlagMask_EngineExternal) != 0;
+#else
+            AssertMsg((this->flags & TypeFlagMask_EngineExternal) == 0, "Not expected.");
+            return false;
+#endif
+        }
         inline BOOL IsJsrtExternal() const { return (this->flags & TypeFlagMask_JsrtExternal) != 0; }
         inline BOOL SkipsPrototype() const { return (this->flags & TypeFlagMask_SkipsPrototype) != 0 ; }
-        inline BOOL CanHaveInterceptors() const { return (this->flags & TypeFlagMask_CanHaveInterceptors) != 0; }
         inline BOOL IsFalsy() const { return flags & TypeFlagMask_IsFalsy; }
         inline BOOL HasBeenCached() const { return flags & TypeFlagMask_HasBeenCached; }
         inline void SetHasBeenCached()

Original file line number	Diff line number	Diff line change
`@@ -2141,7 +2141,7 @@ namespace Js`
`2141`	`2141`	`auto funcPtr = [&]()`
`2142`	`2142`	`{`
`2143`	`2143`	`IGNORE_STACKWALK_EXCEPTION(scriptContext);`
`2144`		`- if (object->CanHaveInterceptors())`
	`2144`	`+ if (object->IsExternal())`
`2145`	`2145`	`{`
`2146`	`2146`	`Js::ForInObjectEnumerator enumerator(object, object->GetScriptContext(), /* enumSymbols */ true);`
`2147`	`2147`	`Js::PropertyId propertyId;`
`@@ -2461,7 +2461,7 @@ namespace Js`
`2461`	`2461`
`2462`	`2462`	`if (JavascriptOperators::IsObject(object))`
`2463`	`2463`	`{`
`2464`		`- if (object->CanHaveInterceptors() \|\| JavascriptOperators::GetTypeId(object) == TypeIds_Proxy)`
	`2464`	`+ if (object->IsExternal() \|\| JavascriptOperators::GetTypeId(object) == TypeIds_Proxy)`
`2465`	`2465`	`{`
`2466`	`2466`	`try`
`2467`	`2467`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace TTD`
`15`	`15`	`{`
`16`	`16`	`void ExtractCompoundObject(NSSnapObjects::SnapObject* sobj, Js::RecyclableObject* obj, bool isWellKnown, const TTDIdentifierDictionary<TTD_PTR_ID, NSSnapType::SnapType*>& idToTypeMap, SlabAllocator& alloc)`
`17`	`17`	`{`
`18`		`- TTDAssert(!obj->CanHaveInterceptors(), "We are not prepared for custom external objects yet");`
	`18`	`+ TTDAssert(!obj->IsExternal(), "We are not prepared for custom external objects yet");`
`19`	`19`
`20`	`20`	`sobj->ObjectPtrId = TTD_CONVERT_VAR_TO_PTR_ID(obj);`
`21`	`21`	`sobj->SnapObjectTag = obj->GetSnapTag_TTD();`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ namespace TTD`
`247`	`247`	`void SnapshotExtractor::MarkVisitVar(Js::Var var)`
`248`	`248`	`{`
`249`	`249`	`TTDAssert(var != nullptr, "I don't think this should happen but not 100% sure.");`
`250`		`- TTDAssert(Js::JavascriptOperators::GetTypeId(var) < Js::TypeIds_Limit \|\| Js::RecyclableObject::FromVar(var)->CanHaveInterceptors(), "Not cool.");`
	`250`	`+ TTDAssert(Js::JavascriptOperators::GetTypeId(var) < Js::TypeIds_Limit \|\| Js::RecyclableObject::FromVar(var)->IsExternal(), "Not cool.");`
`251`	`251`
`252`	`252`	`//We don't need to visit tagged things`
`253`	`253`	`if(JsSupport::IsVarTaggedInline(var))`
Original file line number	Diff line number	Diff line change
`@@ -1045,7 +1045,7 @@ namespace Js`
`1045`	`1045`	`#endif`
`1046`	`1046`	`}`
`1047`	`1047`
`1048`		`- if (RecyclableObject::FromVar(aLeft)->CanHaveInterceptors())`
	`1048`	`+ if (RecyclableObject::FromVar(aLeft)->IsExternal())`
`1049`	`1049`	`{`
`1050`	`1050`	`BOOL result;`
`1051`	`1051`	`if (RecyclableObject::FromVar(aLeft)->StrictEquals(aRight, &result, requestContext))`
`@@ -1057,7 +1057,7 @@ namespace Js`
`1057`	`1057`	`}`
`1058`	`1058`	`}`
`1059`	`1059`
`1060`		`- if (!TaggedNumber::Is(aRight) && RecyclableObject::FromVar(aRight)->CanHaveInterceptors())`
	`1060`	`+ if (!TaggedNumber::Is(aRight) && RecyclableObject::FromVar(aRight)->IsExternal())`
`1061`	`1061`	`{`
`1062`	`1062`	`BOOL result;`
`1063`	`1063`	`if (RecyclableObject::FromVar(aRight)->StrictEquals(aLeft, &result, requestContext))`
`@@ -2356,7 +2356,7 @@ namespace Js`
`2356`	`2356`	`// in 9.1.9, step 5, we should return false if receiver is not object, and that will happen in default RecyclableObject operation anyhow.`
`2357`	`2357`	`if (receiverObject->SetProperty(propertyKey, newValue, propertyOperationFlags, info))`
`2358`	`2358`	`{`
`2359`		`- if (!JavascriptProxy::Is(receiver) && info->GetPropertyString() && info->GetFlags() != InlineCacheSetterFlag && !object->CanHaveInterceptors())`
	`2359`	`+ if (!JavascriptProxy::Is(receiver) && info->GetPropertyString() && info->GetFlags() != InlineCacheSetterFlag && !object->IsExternal())`
`2360`	`2360`	`{`
`2361`	`2361`	`CacheOperators::CachePropertyWrite(RecyclableObject::FromVar(receiver), false, typeWithoutProperty, info->GetPropertyString()->GetPropertyId(), info, requestContext);`
`2362`	`2362`
`@@ -8276,7 +8276,7 @@ namespace Js`
`8276`	`8276`	`// It is valid for some objects to not-support getters and setters, specifically, for projection of an ABI method`
`8277`	`8277`	`// (CustomExternalObject => MapWithStringKey) which SetAccessors returns VBSErr_ActionNotSupported.`
`8278`	`8278`	`// But for non-external objects SetAccessors should succeed.`
`8279`		`- Assert(isSetAccessorsSuccess \|\| obj->CanHaveInterceptors());`
	`8279`	`+ Assert(isSetAccessorsSuccess \|\| obj->IsExternal());`
`8280`	`8280`
`8281`	`8281`	`// If SetAccessors failed, the property wasn't created, so no need to change the attributes.`
`8282`	`8282`	`if (isSetAccessorsSuccess)`
`@@ -8354,7 +8354,7 @@ namespace Js`
`8354`	`8354`	`// It is valid for some objects to not-support getters and setters, specifically, for projection of an ABI method`
`8355`	`8355`	`// (CustomExternalObject => MapWithStringKey) which SetAccessors returns VBSErr_ActionNotSupported.`
`8356`	`8356`	`// But for non-external objects SetAccessors should succeed.`
`8357`		`- Assert(isSetAccessorsSuccess \|\| obj->CanHaveInterceptors());`
	`8357`	`+ Assert(isSetAccessorsSuccess \|\| obj->IsExternal());`
`8358`	`8358`
`8359`	`8359`	`if (isSetAccessorsSuccess)`
`8360`	`8360`	`{`
Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ namespace Js`
`635`	`635`	`BOOL JavascriptObject::GetOwnPropertyDescriptorHelper(RecyclableObject* obj, PropertyId propertyId, ScriptContext* scriptContext, PropertyDescriptor& propertyDescriptor)`
`636`	`636`	`{`
`637`	`637`	`BOOL isPropertyDescriptorDefined;`
`638`		`- if (obj->CanHaveInterceptors())`
	`638`	`+ if (obj->IsExternal())`
`639`	`639`	`{`
`640`	`640`	`isPropertyDescriptorDefined = obj->HasOwnProperty(propertyId) ?`
`641`	`641`	`JavascriptOperators::GetOwnPropertyDescriptor(obj, propertyId, scriptContext, &propertyDescriptor) : obj->GetDefaultPropertyDescriptor(propertyDescriptor);`
Original file line number	Diff line number	Diff line change
`@@ -56,14 +56,6 @@ namespace Js`
`56`	`56`	`return this->GetLibrary()->GetScriptContext();`
`57`	`57`	`}`
`58`	`58`
`59`		`- inline BOOL RecyclableObject::CanHaveInterceptors() const`
`60`		`- {`
`61`		`-#if !defined(USED_IN_STATIC_LIB)`
`62`		`- Assert(this->DbgCanHaveInterceptors() == this->GetType()->CanHaveInterceptors());`
`63`		`-#endif`
`64`		`- return this->GetType()->CanHaveInterceptors();`
`65`		`- }`
`66`		`-`
`67`	`59`	`inline BOOL RecyclableObject::HasItem(uint32 index)`
`68`	`60`	`{`
`69`	`61`	`return JavascriptConversion::PropertyQueryFlagsToBoolean(HasItemQuery(index));`