Index: src/arm/stub-cache-arm.cc |
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
index 7db00c697b92069766760587ccf88f24ed297c3c..7605525264fd57f3302dea064a4cd985991fa2cc 100644 |
--- a/src/arm/stub-cache-arm.cc |
+++ b/src/arm/stub-cache-arm.cc |
@@ -903,21 +903,13 @@ static void GenerateFastApiDirectCall(MacroAssembler* masm, |
const int kStackUnwindSpace = argc + kFastApiCallArguments + 1; |
Address function_address = v8::ToCData<Address>(api_call_info->callback()); |
- // TODO(dcarney): fix signatures using returns_handle |
- const bool returns_handle = false; |
ApiFunction fun(function_address); |
- ExternalReference::Type type = |
- returns_handle ? |
- ExternalReference::DIRECT_API_CALL : |
- ExternalReference::DIRECT_API_CALL_NEW; |
+ ExternalReference::Type type = ExternalReference::DIRECT_API_CALL; |
ExternalReference ref = ExternalReference(&fun, |
type, |
masm->isolate()); |
Address thunk_address = FUNCTION_ADDR(&InvokeFunctionCallback); |
- ExternalReference::Type thunk_type = |
- returns_handle ? |
- ExternalReference::PROFILING_API_CALL : |
- ExternalReference::PROFILING_API_CALL_NEW; |
+ ExternalReference::Type thunk_type = ExternalReference::PROFILING_API_CALL; |
ApiFunction thunk_fun(thunk_address); |
ExternalReference thunk_ref = ExternalReference(&thunk_fun, thunk_type, |
masm->isolate()); |
@@ -928,7 +920,6 @@ static void GenerateFastApiDirectCall(MacroAssembler* masm, |
thunk_ref, |
r1, |
kStackUnwindSpace, |
- returns_handle, |
kFastApiCallArguments + 1); |
} |
@@ -1422,19 +1413,14 @@ void BaseLoadStubCompiler::GenerateLoadCallback( |
const int kStackUnwindSpace = kFastApiCallArguments + 1; |
Address getter_address = v8::ToCData<Address>(callback->getter()); |
- // TODO(dcarney): fix signatures using returns_handle |
- const bool returns_handle = false; |
ApiFunction fun(getter_address); |
- ExternalReference::Type type = |
- returns_handle ? |
- ExternalReference::DIRECT_GETTER_CALL : |
- ExternalReference::DIRECT_GETTER_CALL_NEW; |
+ ExternalReference::Type type = ExternalReference::DIRECT_GETTER_CALL; |
ExternalReference ref = ExternalReference(&fun, type, isolate()); |
Address thunk_address = FUNCTION_ADDR(&InvokeAccessorGetterCallback); |
ExternalReference::Type thunk_type = |
- ExternalReference::PROFILING_GETTER_CALL_NEW; |
+ ExternalReference::PROFILING_GETTER_CALL; |
ApiFunction thunk_fun(thunk_address); |
ExternalReference thunk_ref = ExternalReference(&thunk_fun, thunk_type, |
isolate()); |
@@ -1443,7 +1429,6 @@ void BaseLoadStubCompiler::GenerateLoadCallback( |
thunk_ref, |
r2, |
kStackUnwindSpace, |
- returns_handle, |
5); |
} |