| Index: src/ia32/macro-assembler-ia32.cc
|
| diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
|
| index ea9bdee22b88a8bad422313cae8aa4411158529e..d39264ab96a061c2f9e7750867bbf621e2e2f1b3 100644
|
| --- a/src/ia32/macro-assembler-ia32.cc
|
| +++ b/src/ia32/macro-assembler-ia32.cc
|
| @@ -1026,12 +1026,11 @@ void MacroAssembler::LeaveApiExitFrame(bool restore_context) {
|
| void MacroAssembler::PushTryHandler(StackHandler::Kind kind,
|
| int handler_index) {
|
| // Adjust this code if not the case.
|
| - STATIC_ASSERT(StackHandlerConstants::kSize == 5 * kPointerSize);
|
| + STATIC_ASSERT(StackHandlerConstants::kSize == 4 * kPointerSize);
|
| STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0);
|
| - 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);
|
|
|
| // We will build up the handler from the bottom by pushing on the stack.
|
| // First push the frame pointer and context.
|
| @@ -1045,12 +1044,11 @@ void MacroAssembler::PushTryHandler(StackHandler::Kind kind,
|
| push(ebp);
|
| push(esi);
|
| }
|
| - // Push the state and the code object.
|
| + // Push the state.
|
| unsigned state =
|
| StackHandler::IndexField::encode(handler_index) |
|
| StackHandler::KindField::encode(kind);
|
| push(Immediate(state));
|
| - Push(CodeObject());
|
|
|
| // Link the current handler as the next handler.
|
| ExternalReference handler_address(Isolate::kHandlerAddress, isolate());
|
|
|