| Index: src/x64/macro-assembler-x64.cc
|
| diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
|
| index 12c471c2fface1519c1141ef9ee701a9fb7c80da..d3afbe6b141ca95f614ebefaafc4c4b2af0e8113 100644
|
| --- a/src/x64/macro-assembler-x64.cc
|
| +++ b/src/x64/macro-assembler-x64.cc
|
| @@ -3001,34 +3001,21 @@ Operand MacroAssembler::SafepointRegisterSlot(Register reg) {
|
| }
|
|
|
|
|
| -void MacroAssembler::PushTryHandler(StackHandler::Kind kind,
|
| - int handler_index) {
|
| +void MacroAssembler::PushStackHandler() {
|
| // Adjust this code if not the case.
|
| - STATIC_ASSERT(StackHandlerConstants::kSize == 3 * kPointerSize);
|
| + STATIC_ASSERT(StackHandlerConstants::kSize == 1 * kPointerSize);
|
| STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0);
|
| - STATIC_ASSERT(StackHandlerConstants::kStateOffset == 1 * kPointerSize);
|
| - STATIC_ASSERT(StackHandlerConstants::kContextOffset == 2 * kPointerSize);
|
| -
|
| - // We will build up the handler from the bottom by pushing on the stack.
|
| - // First push the context.
|
| - if (kind == StackHandler::JS_ENTRY) {
|
| - Push(Smi::FromInt(0)); // No context.
|
| - } else {
|
| - Push(rsi);
|
| - }
|
| -
|
| - // Push the index.
|
| - Push(Immediate(handler_index));
|
|
|
| // Link the current handler as the next handler.
|
| ExternalReference handler_address(Isolate::kHandlerAddress, isolate());
|
| Push(ExternalOperand(handler_address));
|
| +
|
| // Set this new handler as the current one.
|
| movp(ExternalOperand(handler_address), rsp);
|
| }
|
|
|
|
|
| -void MacroAssembler::PopTryHandler() {
|
| +void MacroAssembler::PopStackHandler() {
|
| STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0);
|
| ExternalReference handler_address(Isolate::kHandlerAddress, isolate());
|
| Pop(ExternalOperand(handler_address));
|
|
|