[MERGE chakra-core#955] Fix DRT issue related to HostDispatch property access

pleath · pleath · commit d77265fbf149 · 2016-05-09T16:24:11.000-07:00
Merge pull request chakra-core#955 from pleath:7485108 My cleanup of the shortcut-property-access-on-unknown-property-name optimization relied on IsExternal() to tell us whether an object is eligible. But we must also exclude HostDispatch, which returns false on IsExternal().
diff --git a/lib/Runtime/Language/JavascriptOperators.cpp b/lib/Runtime/Language/JavascriptOperators.cpp
@@ -5044,15 +5044,20 @@ namespace Js
             return false;
         }
 
-        if (JavascriptProxy::Is(instance) || instance->IsExternal())
+        TypeId typeId = instance->GetTypeId();
+        if (typeId == TypeIds_Proxy || typeId == TypeIds_HostDispatch)
         {
             return false;
         }
-        if (DynamicType::Is(instance->GetTypeId()) && 
+        if (DynamicType::Is(typeId) && 
             static_cast<DynamicObject*>(instance)->GetTypeHandler()->IsStringTypeHandler())
         {
             return false;
         }
+        if (instance->IsExternal())
+        {
+            return false;
+        }
         return !(instance->HasDeferredTypeHandler() &&
                  JavascriptFunction::Is(instance) && 
                  JavascriptFunction::FromVar(instance)->IsExternalFunction());

Original file line number	Diff line number	Diff line change
`@@ -5044,15 +5044,20 @@ namespace Js`
`5044`	`5044`	`return false;`
`5045`	`5045`	`}`
`5046`	`5046`
`5047`		`- if (JavascriptProxy::Is(instance) \|\| instance->IsExternal())`
	`5047`	`+ TypeId typeId = instance->GetTypeId();`
	`5048`	`+ if (typeId == TypeIds_Proxy \|\| typeId == TypeIds_HostDispatch)`
`5048`	`5049`	`{`
`5049`	`5050`	`return false;`
`5050`	`5051`	`}`
`5051`		`- if (DynamicType::Is(instance->GetTypeId()) &&`
	`5052`	`+ if (DynamicType::Is(typeId) &&`
`5052`	`5053`	`static_cast<DynamicObject*>(instance)->GetTypeHandler()->IsStringTypeHandler())`
`5053`	`5054`	`{`
`5054`	`5055`	`return false;`
`5055`	`5056`	`}`
	`5057`	`+ if (instance->IsExternal())`
	`5058`	`+ {`
	`5059`	`+ return false;`
	`5060`	`+ }`
`5056`	`5061`	`return !(instance->HasDeferredTypeHandler() &&`
`5057`	`5062`	`JavascriptFunction::Is(instance) &&`
`5058`	`5063`	`JavascriptFunction::FromVar(instance)->IsExternalFunction());`