Revert of Remove kind field from StackHandler.

src/x64/macro-assembler-x64.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_X64
 
 #include "src/base/bits.h"
 #include "src/base/division-by-constant.h"
@@ skipping 2977 matching lines @@
   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));
+  // Push the state.
+  unsigned state =
+      StackHandler::IndexField::encode(handler_index) |
+      StackHandler::KindField::encode(kind);
+  Push(Immediate(state));
 
   // 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() {
@@ skipping 2066 matching lines @@
   if (mag.shift > 0) sarl(rdx, Immediate(mag.shift));
   movl(rax, dividend);
   shrl(rax, Immediate(31));
   addl(rdx, rax);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64