| Index: src/arm64/macro-assembler-arm64.cc
|
| diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc
|
| index 87bb2966b09796d050ce1a264e1ee3d3fb42f77b..b6030981cf8bd05891fdd0282ad3643275a95b0c 100644
|
| --- a/src/arm64/macro-assembler-arm64.cc
|
| +++ b/src/arm64/macro-assembler-arm64.cc
|
| @@ -3042,12 +3042,11 @@ void MacroAssembler::PushTryHandler(StackHandler::Kind kind,
|
| int handler_index) {
|
| DCHECK(jssp.Is(StackPointer()));
|
| // Adjust this code if the asserts don't hold.
|
| - STATIC_ASSERT(StackHandlerConstants::kSize == 5 * kPointerSize);
|
| + STATIC_ASSERT(StackHandlerConstants::kSize == 4 * kPointerSize);
|
| STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0 * kPointerSize);
|
| - STATIC_ASSERT(StackHandlerConstants::kCodeOffset == 1 * kPointerSize);
|
| - STATIC_ASSERT(StackHandlerConstants::kStateOffset == 2 * kPointerSize);
|
| - STATIC_ASSERT(StackHandlerConstants::kContextOffset == 3 * kPointerSize);
|
| - STATIC_ASSERT(StackHandlerConstants::kFPOffset == 4 * kPointerSize);
|
| + STATIC_ASSERT(StackHandlerConstants::kStateOffset == 1 * kPointerSize);
|
| + STATIC_ASSERT(StackHandlerConstants::kContextOffset == 2 * kPointerSize);
|
| + STATIC_ASSERT(StackHandlerConstants::kFPOffset == 3 * kPointerSize);
|
|
|
| // For the JSEntry handler, we must preserve the live registers x0-x4.
|
| // (See JSEntryStub::GenerateBody().)
|
| @@ -3056,16 +3055,15 @@ void MacroAssembler::PushTryHandler(StackHandler::Kind kind,
|
| StackHandler::IndexField::encode(handler_index) |
|
| StackHandler::KindField::encode(kind);
|
|
|
| - // Set up the code object and the state for pushing.
|
| - Mov(x10, Operand(CodeObject()));
|
| + // Set up the state for pushing.
|
| Mov(x11, state);
|
|
|
| - // Push the frame pointer, context, state, and code object.
|
| + // Push the frame pointer, context, and state.
|
| if (kind == StackHandler::JS_ENTRY) {
|
| DCHECK(Smi::FromInt(0) == 0);
|
| - Push(xzr, xzr, x11, x10);
|
| + Push(xzr, xzr, x11);
|
| } else {
|
| - Push(fp, cp, x11, x10);
|
| + Push(fp, cp, x11);
|
| }
|
|
|
| // Link the current handler as the next handler.
|
|
|