Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index 54114dbc5d2633fa8460fca97e3056875c1530b2..14d0bfdd012629238cbf8bed093d6bd5ab0c6219 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -2671,9 +2671,10 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback( |
Handle<Code> StoreStubCompiler::CompileStoreViaSetter( |
+ Handle<String> name, |
Handle<JSObject> receiver, |
- Handle<JSFunction> setter, |
- Handle<String> name) { |
+ Handle<JSObject> holder, |
+ Handle<JSFunction> setter) { |
// ----------- S t a t e ------------- |
// -- r0 : value |
// -- r1 : receiver |
@@ -2682,9 +2683,9 @@ Handle<Code> StoreStubCompiler::CompileStoreViaSetter( |
// ----------------------------------- |
Label miss; |
- // Check that the map of the object hasn't changed. |
- __ CheckMap(r1, r3, Handle<Map>(receiver->map()), &miss, DO_SMI_CHECK, |
- ALLOW_ELEMENT_TRANSITION_MAPS); |
+ // Check that the maps haven't changed. |
+ __ JumpIfSmi(r1, &miss); |
+ CheckPrototypes(receiver, r1, holder, r3, r4, r5, name, &miss); |
{ |
FrameScope scope(masm(), StackFrame::INTERNAL); |
@@ -2692,7 +2693,7 @@ Handle<Code> StoreStubCompiler::CompileStoreViaSetter( |
// Save value register, so we can restore it later. |
__ push(r0); |
- // Call the JavaScript getter with the receiver and the value on the stack. |
+ // Call the JavaScript setter with the receiver and the value on the stack. |
__ Push(r1, r0); |
ParameterCount actual(1); |
__ InvokeFunction(setter, actual, CALL_FUNCTION, NullCallWrapper(), |