Index: src/ia32/stub-cache-ia32.cc |
diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc |
index d205ccb78903e1a7f4b198e188af7a0fd51ae933..5f1e26b932f57cff9398c573c98cf30ac1a74423 100644 |
--- a/src/ia32/stub-cache-ia32.cc |
+++ b/src/ia32/stub-cache-ia32.cc |
@@ -2601,9 +2601,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 ------------- |
// -- eax : value |
// -- ecx : name |
@@ -2611,19 +2612,14 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback( |
// -- esp[0] : return address |
// ----------------------------------- |
Label miss; |
+ // Check that the maps haven't changed, preserving the value register. |
+ __ push(eax); |
+ __ JumpIfSmi(edx, &miss); |
+ CheckPrototypes(receiver, edx, holder, ebx, eax, edi, name, &miss); |
+ __ pop(eax); // restore value |
- // Check that the map of the object hasn't changed. |
- __ CheckMap(edx, Handle<Map>(object->map()), |
- &miss, DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS); |
- |
- // Perform global security token check if needed. |
- if (object->IsJSGlobalProxy()) { |
- __ CheckAccessGlobalProxy(edx, ebx, &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(ebx); // remove the return address |
__ push(edx); // receiver |
@@ -2639,6 +2635,7 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback( |
// Handle store cache miss. |
__ bind(&miss); |
+ __ pop(eax); |
Handle<Code> ic = isolate()->builtins()->StoreIC_Miss(); |
__ jmp(ic, RelocInfo::CODE_TARGET); |