| Index: src/x64/macro-assembler-x64.cc
|
| diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
|
| index 89016f85afa242fb235a513b91dc5874421a2e70..5a17b3a6f3aa2e10fa0743196f8901fe2779fd28 100644
|
| --- a/src/x64/macro-assembler-x64.cc
|
| +++ b/src/x64/macro-assembler-x64.cc
|
| @@ -2982,23 +2982,16 @@ Operand MacroAssembler::SafepointRegisterSlot(Register reg) {
|
| void MacroAssembler::PushTryHandler(StackHandler::Kind kind,
|
| int handler_index) {
|
| // Adjust this code if not the case.
|
| - STATIC_ASSERT(StackHandlerConstants::kSize == 3 * kPointerSize +
|
| - kFPOnStackSize);
|
| + STATIC_ASSERT(StackHandlerConstants::kSize == 3 * kPointerSize);
|
| STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0);
|
| STATIC_ASSERT(StackHandlerConstants::kStateOffset == 1 * kPointerSize);
|
| STATIC_ASSERT(StackHandlerConstants::kContextOffset == 2 * kPointerSize);
|
| - STATIC_ASSERT(StackHandlerConstants::kFPOffset == 3 * kPointerSize);
|
|
|
| // We will build up the handler from the bottom by pushing on the stack.
|
| - // First push the frame pointer and context.
|
| + // First push the context.
|
| if (kind == StackHandler::JS_ENTRY) {
|
| - // The frame pointer does not point to a JS frame so we save NULL for
|
| - // rbp. We expect the code throwing an exception to check rbp before
|
| - // dereferencing it to restore the context.
|
| - pushq(Immediate(0)); // NULL frame pointer.
|
| Push(Smi::FromInt(0)); // No context.
|
| } else {
|
| - pushq(rbp);
|
| Push(rsi);
|
| }
|
|
|
|
|