Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index 7605525264fd57f3302dea064a4cd985991fa2cc..0e62d1a06079b831ac554a98c99294d4535eeb2e 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -1292,7 +1292,7 @@ Register BaseLoadStubCompiler::CallbackHandlerFrontend( |
Handle<JSObject> holder, |
Handle<Name> name, |
Label* success, |
- Handle<ExecutableAccessorInfo> callback) { |
+ Handle<Object> callback) { |
Label miss; |
Register reg = HandlerFrontendHeader(object, object_reg, holder, name, &miss); |
@@ -1381,6 +1381,30 @@ void BaseLoadStubCompiler::GenerateLoadConstant(Handle<Object> value) { |
void BaseLoadStubCompiler::GenerateLoadCallback( |
Register reg, |
+ const CallOptimization& call_optimization) { |
+ ASSERT(call_optimization.is_simple_api_call()); |
+ ASSERT(!scratch3().is(reg)); |
+ ASSERT(!receiver().is(reg)); |
+ |
+ // assign stack space for the call arguments |
+ __ sub(sp, sp, Operand((kFastApiCallArguments + 1) * kPointerSize)); |
+ |
+ int argc = 0; |
+ int api_call_argc = argc + kFastApiCallArguments; |
+ // write holder to stack frame |
+ Register holder = |
+ call_optimization.expected_receiver_type().is_null() ? |
+ receiver() : reg; |
+ __ str(holder, MemOperand(sp, 1 * kPointerSize)); |
+ // write receiver to stack frame |
+ __ str(receiver(), MemOperand(sp, (api_call_argc + 0) * kPointerSize)); |
+ |
+ GenerateFastApiDirectCall(masm(), call_optimization, argc); |
+} |
+ |
+ |
+void BaseLoadStubCompiler::GenerateLoadCallback( |
+ Register reg, |
Handle<ExecutableAccessorInfo> callback) { |
// Build AccessorInfo::args_ list on the stack and push property name below |
// the exit frame to make GC aware of them and store pointers to them. |