Fastpath for hasOwnProperty == true.

dilijev · dilijev · commit c1e972d09951 · 2016-08-16T17:24:13.000-07:00
diff --git a/lib/Runtime/Base/ScriptContext.cpp b/lib/Runtime/Base/ScriptContext.cpp
@@ -1454,22 +1454,33 @@ if (!sourceList)
         return NULL;
     }
 
-
-    PropertyString* ScriptContext::GetPropertyString(PropertyId propertyId)
+    PropertyString* ScriptContext::TryGetPropertyString(PropertyId propertyId)
     {
         PropertyStringCacheMap* propertyStringMap = this->GetLibrary()->EnsurePropertyStringMap();
 
-        PropertyString *string;
         RecyclerWeakReference<PropertyString>* stringReference;
         if (propertyStringMap->TryGetValue(propertyId, &stringReference))
         {
-            string = stringReference->Get();
+            PropertyString *string = stringReference->Get();
             if (string != nullptr)
             {
                 return string;
             }
         }
 
+        return nullptr;
+    }
+
+    PropertyString* ScriptContext::GetPropertyString(PropertyId propertyId)
+    {
+        PropertyString *string = TryGetPropertyString(propertyId);
+        if (string != nullptr)
+        {
+            return string;
+        }
+
+        PropertyStringCacheMap* propertyStringMap = this->GetLibrary()->EnsurePropertyStringMap();
+
         const Js::PropertyRecord* propertyName = this->GetPropertyName(propertyId);
         string = this->GetLibrary()->CreatePropertyString(propertyName);
         propertyStringMap->Item(propertyId, recycler->CreateWeakReferenceHandle(string));
diff --git a/lib/Runtime/Base/ScriptContext.h b/lib/Runtime/Base/ScriptContext.h
@@ -1337,6 +1337,7 @@ namespace Js
         void SetDisposeDisposeByFaultInjectionEventHandler(EventHandler eventHandler);
 #endif
         EnumeratedObjectCache* GetEnumeratedObjectCache() { return &(cache->enumObjCache); }
+        PropertyString* TryGetPropertyString(PropertyId propertyId);
         PropertyString* GetPropertyString(PropertyId propertyId);
         void InvalidatePropertyStringCache(PropertyId propertyId, Type* type);
         JavascriptString* GetIntegerString(Var aValue);
diff --git a/lib/Runtime/Language/JavascriptOperators.cpp b/lib/Runtime/Language/JavascriptOperators.cpp
@@ -1075,10 +1075,9 @@ namespace Js
 
     BOOL JavascriptOperators::HasOwnProperty(Var instance, PropertyId propertyId, ScriptContext *requestContext)
     {
-        BOOL result;
         if (TaggedNumber::Is(instance))
         {
-            result = false;
+            return FALSE;
         }
         else
         {
@@ -1091,10 +1090,22 @@ namespace Js
             }
             else
             {
+                PropertyString *propString = requestContext->TryGetPropertyString(propertyId);
+                if (propString != nullptr)
+                {
+                    const PropertyCache *propCache = propString->GetPropertyCache();
+                    if (object->GetType() == propCache->type)
+                    {
+                        // The type cached for the property was the same as the type of this object
+                        // (i.e. obj in obj.hasOwnProperty), so we know the answer is "true".
+                        Assert(TRUE == (object && object->HasOwnProperty(propertyId))); // sanity check on the fastpath result
+                        return TRUE;
+                    }
+                }
+
                 return object && object->HasOwnProperty(propertyId);
             }
         }
-        return result;
     }
 
     BOOL JavascriptOperators::GetOwnAccessors(Var instance, PropertyId propertyId, Var* getter, Var* setter, ScriptContext * requestContext)

Original file line number	Diff line number	Diff line change
`@@ -1075,10 +1075,9 @@ namespace Js`
`1075`	`1075`
`1076`	`1076`	`BOOL JavascriptOperators::HasOwnProperty(Var instance, PropertyId propertyId, ScriptContext *requestContext)`
`1077`	`1077`	`{`
`1078`		`- BOOL result;`
`1079`	`1078`	`if (TaggedNumber::Is(instance))`
`1080`	`1079`	`{`
`1081`		`- result = false;`
	`1080`	`+ return FALSE;`
`1082`	`1081`	`}`
`1083`	`1082`	`else`
`1084`	`1083`	`{`
`@@ -1091,10 +1090,22 @@ namespace Js`
`1091`	`1090`	`}`
`1092`	`1091`	`else`
`1093`	`1092`	`{`
	`1093`	`+ PropertyString *propString = requestContext->TryGetPropertyString(propertyId);`
	`1094`	`+ if (propString != nullptr)`
	`1095`	`+ {`
	`1096`	`+ const PropertyCache *propCache = propString->GetPropertyCache();`
	`1097`	`+ if (object->GetType() == propCache->type)`
	`1098`	`+ {`
	`1099`	`+ // The type cached for the property was the same as the type of this object`
	`1100`	`+ // (i.e. obj in obj.hasOwnProperty), so we know the answer is "true".`
	`1101`	`+ Assert(TRUE == (object && object->HasOwnProperty(propertyId))); // sanity check on the fastpath result`
	`1102`	`+ return TRUE;`
	`1103`	`+ }`
	`1104`	`+ }`
	`1105`	`+`
`1094`	`1106`	`return object && object->HasOwnProperty(propertyId);`
`1095`	`1107`	`}`
`1096`	`1108`	`}`
`1097`		`- return result;`
`1098`	`1109`	`}`
`1099`	`1110`
`1100`	`1111`	`BOOL JavascriptOperators::GetOwnAccessors(Var instance, PropertyId propertyId, Var* getter, Var* setter, ScriptContext * requestContext)`