Index: src/ia32/stub-cache-ia32.cc |
diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc |
index 2cceecbb30f101a1c0f91f5bb0b73542d46e9617..9aa7baec095f1ba7877b74169b8eeed4ad54c484 100644 |
--- a/src/ia32/stub-cache-ia32.cc |
+++ b/src/ia32/stub-cache-ia32.cc |
@@ -516,31 +516,28 @@ static void GenerateFastApiCall(MacroAssembler* masm, |
// Function address is a foreign pointer outside V8's heap. |
Address function_address = v8::ToCData<Address>(api_call_info->callback()); |
- // TODO(dcarney): fix signatures using returns_handle |
- const bool returns_handle = false; |
- __ PrepareCallApiFunction(kApiArgc + kApiStackSpace, returns_handle); |
+ __ PrepareCallApiFunction(kApiArgc + kApiStackSpace); |
// v8::Arguments::implicit_args_. |
- __ mov(ApiParameterOperand(2, returns_handle), eax); |
+ __ mov(ApiParameterOperand(2), eax); |
__ add(eax, Immediate(argc * kPointerSize)); |
// v8::Arguments::values_. |
- __ mov(ApiParameterOperand(3, returns_handle), eax); |
+ __ mov(ApiParameterOperand(3), eax); |
// v8::Arguments::length_. |
- __ Set(ApiParameterOperand(4, returns_handle), Immediate(argc)); |
+ __ Set(ApiParameterOperand(4), Immediate(argc)); |
// v8::Arguments::is_construct_call_. |
- __ Set(ApiParameterOperand(5, returns_handle), Immediate(0)); |
+ __ Set(ApiParameterOperand(5), Immediate(0)); |
// v8::InvocationCallback's argument. |
- __ lea(eax, ApiParameterOperand(2, returns_handle)); |
- __ mov(ApiParameterOperand(0, returns_handle), eax); |
+ __ lea(eax, ApiParameterOperand(2)); |
+ __ mov(ApiParameterOperand(0), eax); |
Address thunk_address = FUNCTION_ADDR(&InvokeFunctionCallback); |
__ CallApiFunctionAndReturn(function_address, |
thunk_address, |
- ApiParameterOperand(1, returns_handle), |
+ ApiParameterOperand(1), |
argc + kFastApiCallArguments + 1, |
- returns_handle, |
kFastApiCallArguments + 1); |
} |
@@ -1397,12 +1394,10 @@ void BaseLoadStubCompiler::GenerateLoadCallback( |
const int kApiArgc = 2 + 1; |
Address getter_address = v8::ToCData<Address>(callback->getter()); |
- // TODO(dcarney): fix signatures using returns_handle |
- const bool returns_handle = false; |
- __ PrepareCallApiFunction(kApiArgc, returns_handle); |
- __ mov(ApiParameterOperand(0, returns_handle), ebx); // name. |
+ __ PrepareCallApiFunction(kApiArgc); |
+ __ mov(ApiParameterOperand(0), ebx); // name. |
__ add(ebx, Immediate(kPointerSize)); |
- __ mov(ApiParameterOperand(1, returns_handle), ebx); // arguments pointer. |
+ __ mov(ApiParameterOperand(1), ebx); // arguments pointer. |
// Emitting a stub call may try to allocate (if the code is not |
// already generated). Do not allow the assembler to perform a |
@@ -1413,9 +1408,8 @@ void BaseLoadStubCompiler::GenerateLoadCallback( |
__ CallApiFunctionAndReturn(getter_address, |
thunk_address, |
- ApiParameterOperand(2, returns_handle), |
+ ApiParameterOperand(2), |
kStackSpace, |
- returns_handle, |
6); |
} |