| Index: src/arm/stub-cache-arm.cc
|
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
|
| index ff2873d70ab3bfcbd209ff2b12fbc0c35ffbfe80..f9a10c4f253f8c527f766835f4ffa9326877d355 100644
|
| --- a/src/arm/stub-cache-arm.cc
|
| +++ b/src/arm/stub-cache-arm.cc
|
| @@ -2843,9 +2843,10 @@ Handle<Code> StoreStubCompiler::CompileStoreField(Handle<JSObject> object,
|
| }
|
|
|
|
|
| -MaybeObject* StoreStubCompiler::CompileStoreCallback(JSObject* object,
|
| - AccessorInfo* callback,
|
| - String* name) {
|
| +Handle<Code> StoreStubCompiler::CompileStoreCallback(
|
| + Handle<JSObject> object,
|
| + Handle<AccessorInfo> callback,
|
| + Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| // -- r0 : value
|
| // -- r1 : receiver
|
| @@ -2872,7 +2873,7 @@ MaybeObject* StoreStubCompiler::CompileStoreCallback(JSObject* object,
|
| ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded());
|
|
|
| __ push(r1); // receiver
|
| - __ mov(ip, Operand(Handle<AccessorInfo>(callback))); // callback info
|
| + __ mov(ip, Operand(callback)); // callback info
|
| __ Push(ip, r2, r0);
|
|
|
| // Do tail-call to the runtime system.
|
| @@ -2887,12 +2888,13 @@ MaybeObject* StoreStubCompiler::CompileStoreCallback(JSObject* object,
|
| __ Jump(ic, RelocInfo::CODE_TARGET);
|
|
|
| // Return the generated code.
|
| - return TryGetCode(CALLBACKS, name);
|
| + return GetCode(CALLBACKS, name);
|
| }
|
|
|
|
|
| -MaybeObject* StoreStubCompiler::CompileStoreInterceptor(JSObject* receiver,
|
| - String* name) {
|
| +Handle<Code> StoreStubCompiler::CompileStoreInterceptor(
|
| + Handle<JSObject> receiver,
|
| + Handle<String> name) {
|
| // ----------- S t a t e -------------
|
| // -- r0 : value
|
| // -- r1 : receiver
|
| @@ -2935,7 +2937,7 @@ MaybeObject* StoreStubCompiler::CompileStoreInterceptor(JSObject* receiver,
|
| __ Jump(ic, RelocInfo::CODE_TARGET);
|
|
|
| // Return the generated code.
|
| - return TryGetCode(INTERCEPTOR, name);
|
| + return GetCode(INTERCEPTOR, name);
|
| }
|
|
|
|
|
|
|