| Index: src/arm/stub-cache-arm.cc
|
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
|
| index 86c247f61a7477cd8d82f55bc84c473dc45c6a03..058c29b019b6489dc6fdbea0a307a3b357577a32 100644
|
| --- a/src/arm/stub-cache-arm.cc
|
| +++ b/src/arm/stub-cache-arm.cc
|
| @@ -2673,9 +2673,10 @@ Handle<Code> StoreStubCompiler::CompileStoreField(Handle<JSObject> object,
|
|
|
|
|
| Handle<Code> StoreStubCompiler::CompileStoreCallback(
|
| - Handle<JSObject> object,
|
| - Handle<AccessorInfo> callback,
|
| - Handle<String> name) {
|
| + Handle<String> name,
|
| + Handle<JSObject> receiver,
|
| + Handle<JSObject> holder,
|
| + Handle<AccessorInfo> callback) {
|
| // ----------- S t a t e -------------
|
| // -- r0 : value
|
| // -- r1 : receiver
|
| @@ -2683,19 +2684,12 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback(
|
| // -- lr : return address
|
| // -----------------------------------
|
| Label miss;
|
| + // Check that the maps haven't changed.
|
| + __ JumpIfSmi(r1, &miss);
|
| + CheckPrototypes(receiver, r1, holder, r3, r4, r5, name, &miss);
|
|
|
| - // Check that the map of the object hasn't changed.
|
| - __ CheckMap(r1, r3, Handle<Map>(object->map()), &miss,
|
| - DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS);
|
| -
|
| - // Perform global security token check if needed.
|
| - if (object->IsJSGlobalProxy()) {
|
| - __ CheckAccessGlobalProxy(r1, r3, &miss);
|
| - }
|
| -
|
| - // Stub never generated for non-global objects that require access
|
| - // checks.
|
| - ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded());
|
| + // Stub never generated for non-global objects that require access checks.
|
| + ASSERT(holder->IsJSGlobalProxy() || !holder->IsAccessCheckNeeded());
|
|
|
| __ push(r1); // receiver
|
| __ mov(ip, Operand(callback)); // callback info
|
|
|