Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index 1bb772e0a19b86a13084a77f09afb3aa69ab4b06..0c7df71eaf646d0cdb451a05035843daa77e1359 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -1307,6 +1307,21 @@ void StoreStubCompiler::GenerateStoreViaSetter( |
Handle<Code> StoreStubCompiler::CompileStoreInterceptor( |
Handle<JSObject> object, |
Handle<Name> name) { |
+ Label miss; |
+ |
+ // Check that the map of the object hasn't changed. |
+ __ CheckMap(receiver(), scratch1(), Handle<Map>(object->map()), &miss, |
+ DO_SMI_CHECK); |
+ |
+ // Perform global security token check if needed. |
+ if (object->IsJSGlobalProxy()) { |
+ __ CheckAccessGlobalProxy(receiver(), scratch1(), &miss); |
+ } |
+ |
+ // Stub is never generated for non-global objects that require access |
+ // checks. |
+ ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded()); |
+ |
__ Push(receiver(), this->name(), value()); |
// Do tail-call to the runtime system. |
@@ -1314,6 +1329,10 @@ Handle<Code> StoreStubCompiler::CompileStoreInterceptor( |
ExternalReference(IC_Utility(IC::kStoreInterceptorProperty), isolate()); |
__ TailCallExternalReference(store_ic_property, 3, 1); |
+ // Handle store cache miss. |
+ __ bind(&miss); |
+ TailCallBuiltin(masm(), MissBuiltin(kind())); |
+ |
// Return the generated code. |
return GetCode(kind(), Code::FAST, name); |
} |