| Index: src/x64/macro-assembler-x64.cc
|
| diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
|
| index c38a6f3033a5c71f95ddac44e69931ce2a31278d..74bc189f57e3bda4a846e6beeb620bd5d354fb39 100644
|
| --- a/src/x64/macro-assembler-x64.cc
|
| +++ b/src/x64/macro-assembler-x64.cc
|
| @@ -667,7 +667,7 @@ void MacroAssembler::PrepareCallApiFunction(int arg_stack_space) {
|
|
|
| void MacroAssembler::CallApiFunctionAndReturn(
|
| Register function_address,
|
| - Address thunk_address,
|
| + ExternalReference thunk_ref,
|
| Register thunk_last_arg,
|
| int stack_space,
|
| Operand return_value_operand,
|
| @@ -714,16 +714,13 @@ void MacroAssembler::CallApiFunctionAndReturn(
|
|
|
| Label profiler_disabled;
|
| Label end_profiler_check;
|
| - bool* is_profiling_flag =
|
| - isolate()->cpu_profiler()->is_profiling_address();
|
| - STATIC_ASSERT(sizeof(*is_profiling_flag) == 1);
|
| - Move(rax, is_profiling_flag, RelocInfo::EXTERNAL_REFERENCE);
|
| + Move(rax, ExternalReference::is_profiling_address(isolate()));
|
| cmpb(Operand(rax, 0), Immediate(0));
|
| j(zero, &profiler_disabled);
|
|
|
| // Third parameter is the address of the actual getter function.
|
| Move(thunk_last_arg, function_address);
|
| - Move(rax, thunk_address, RelocInfo::EXTERNAL_REFERENCE);
|
| + Move(rax, thunk_ref);
|
| jmp(&end_profiler_check);
|
|
|
| bind(&profiler_disabled);
|
|
|