Index: src/x64/code-stubs-x64.cc |
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc |
index f9856696c7df83c65fd6da08e67326540b6292a7..ecf58c977813ac81d6e85cac5c1133b2e26c8c35 100644 |
--- a/src/x64/code-stubs-x64.cc |
+++ b/src/x64/code-stubs-x64.cc |
@@ -4842,7 +4842,8 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) { |
// v8::InvocationCallback's argument. |
__ leap(arguments_arg, StackSpaceOperand(0)); |
- Address thunk_address = FUNCTION_ADDR(&InvokeFunctionCallback); |
+ ExternalReference thunk_ref = |
+ ExternalReference::invoke_function_callback(isolate()); |
// Accessor for FunctionCallbackInfo and first js arg. |
StackArgumentsAccessor args_from_rbp(rbp, FCA::kArgsLength + 1, |
@@ -4854,7 +4855,7 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) { |
is_store ? 0 : FCA::kArgsLength - FCA::kReturnValueOffset); |
__ CallApiFunctionAndReturn( |
api_function_address, |
- thunk_address, |
+ thunk_ref, |
callback_arg, |
argc + FCA::kArgsLength + 1, |
return_value_operand, |
@@ -4901,7 +4902,8 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) { |
// could be used to pass arguments. |
__ leap(accessor_info_arg, StackSpaceOperand(0)); |
- Address thunk_address = FUNCTION_ADDR(&InvokeAccessorGetterCallback); |
+ ExternalReference thunk_ref = |
+ ExternalReference::invoke_accessor_getter_callback(isolate()); |
// It's okay if api_function_address == getter_arg |
// but not accessor_info_arg or name_arg |
@@ -4914,7 +4916,7 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) { |
PropertyCallbackArguments::kArgsLength - 1 - |
PropertyCallbackArguments::kReturnValueOffset); |
__ CallApiFunctionAndReturn(api_function_address, |
- thunk_address, |
+ thunk_ref, |
getter_arg, |
kStackSpace, |
return_value_operand, |