| Index: src/x64/code-stubs-x64.cc
|
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
|
| index 2f4025184191b897b7e51850200d1638a117d41d..449123dc42a1c6018b35d9d96405f675318e2d0c 100644
|
| --- a/src/x64/code-stubs-x64.cc
|
| +++ b/src/x64/code-stubs-x64.cc
|
| @@ -3450,9 +3450,7 @@ void CEntryStub::Generate(MacroAssembler* masm) {
|
|
|
| void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) {
|
| Label invoke, exit;
|
| -#ifdef ENABLE_LOGGING_AND_PROFILING
|
| Label not_outermost_js, not_outermost_js_2;
|
| -#endif
|
| { // NOLINT. Scope block confuses linter.
|
| MacroAssembler::NoRootArrayScope uninitialized_root_register(masm);
|
| // Setup frame.
|
| @@ -3497,7 +3495,6 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) {
|
| __ push(c_entry_fp_operand);
|
| }
|
|
|
| -#ifdef ENABLE_LOGGING_AND_PROFILING
|
| // If this is the outermost JS call, set js_entry_sp value.
|
| ExternalReference js_entry_sp(Isolate::k_js_entry_sp_address, isolate);
|
| __ Load(rax, js_entry_sp);
|
| @@ -3511,7 +3508,6 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) {
|
| __ bind(¬_outermost_js);
|
| __ Push(Smi::FromInt(StackFrame::INNER_JSENTRY_FRAME));
|
| __ bind(&cont);
|
| -#endif
|
|
|
| // Call a faked try-block that does the invoke.
|
| __ call(&invoke);
|
| @@ -3555,7 +3551,6 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) {
|
| __ PopTryHandler();
|
|
|
| __ bind(&exit);
|
| -#ifdef ENABLE_LOGGING_AND_PROFILING
|
| // Check if the current stack frame is marked as the outermost JS frame.
|
| __ pop(rbx);
|
| __ Cmp(rbx, Smi::FromInt(StackFrame::OUTERMOST_JSENTRY_FRAME));
|
| @@ -3563,7 +3558,6 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) {
|
| __ movq(kScratchRegister, js_entry_sp);
|
| __ movq(Operand(kScratchRegister, 0), Immediate(0));
|
| __ bind(¬_outermost_js_2);
|
| -#endif
|
|
|
| // Restore the top frame descriptor from the stack.
|
| { Operand c_entry_fp_operand = masm->ExternalOperand(c_entry_fp);
|
|
|