MIPS: Remove code object from StackHandler.

src/mips64/macro-assembler-mips64.cc

Index: src/mips64/macro-assembler-mips64.cc
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc
index 893a253e9ddbea6440d90597fbe78d87c2149c65..d6398f24c8da27d680002c1d8fd9f3c2c3967cc3 100644
--- a/src/mips64/macro-assembler-mips64.cc
+++ b/src/mips64/macro-assembler-mips64.cc
@@ -3225,32 +3225,31 @@ void MacroAssembler::DebugBreak() {
 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 * 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 a0-a3 and s0.
   // a5-a7 are available. We will build up the handler from the bottom by
   // pushing on the stack.
-  // Set up the code object (a5) and the state (a6) for pushing.
+  // Set up the the state (r6) for pushing.
   unsigned state =
       StackHandler::IndexField::encode(handler_index) |
       StackHandler::KindField::encode(kind);
   li(a5, Operand(CodeObject()), CONSTANT_SIZE);
   li(a6, Operand(state));
 
-  // Push the frame pointer, context, state, and code object.
+  // Push the frame pointer, context, and state.
   if (kind == StackHandler::JS_ENTRY) {
     DCHECK_EQ(static_cast<Smi*>(0), Smi::FromInt(0));
     // The second zero_reg indicates no context.
     // The first zero_reg is the NULL frame pointer.
     // The operands are reversed to match the order of MultiPush/Pop.
-    Push(zero_reg, zero_reg, a6, a5);
+    Push(zero_reg, zero_reg, a6);
   } else {
-    MultiPush(a5.bit() | a6.bit() | cp.bit() | fp.bit());
+    MultiPush(a6.bit() | cp.bit() | fp.bit());
   }
 
   // Link the current handler as the next handler.