| Index: src/x64/stub-cache-x64.cc
|
| diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
|
| index 02b4bbeec15ba79fbfda6ceeef8a732bbb69b50b..cb6198ac0dedb8220667dcd0ca4506e9b04de6c7 100644
|
| --- a/src/x64/stub-cache-x64.cc
|
| +++ b/src/x64/stub-cache-x64.cc
|
| @@ -2429,9 +2429,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 -------------
|
| // -- rax : value
|
| // -- rcx : name
|
| @@ -2439,19 +2440,12 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback(
|
| // -- rsp[0] : return address
|
| // -----------------------------------
|
| Label miss;
|
| + // Check that the maps haven't changed.
|
| + __ JumpIfSmi(rdx, &miss);
|
| + CheckPrototypes(receiver, rdx, holder, rbx, r8, rdi, name, &miss);
|
|
|
| - // Check that the map of the object hasn't changed.
|
| - __ CheckMap(rdx, Handle<Map>(object->map()), &miss,
|
| - DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS);
|
| -
|
| - // Perform global security token check if needed.
|
| - if (object->IsJSGlobalProxy()) {
|
| - __ CheckAccessGlobalProxy(rdx, rbx, &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());
|
|
|
| __ pop(rbx); // remove the return address
|
| __ push(rdx); // receiver
|
|
|