Revert of Remove kind field from StackHandler.

src/ia32/macro-assembler-ia32.cc

Index: src/ia32/macro-assembler-ia32.cc
diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
index 52e674f9dc035a991b0356ab72148c2a60447f56..c25b8178f21c68e58e7a2caedf32d067a04612c5 100644
--- a/src/ia32/macro-assembler-ia32.cc
+++ b/src/ia32/macro-assembler-ia32.cc
@@ -1038,9 +1038,11 @@
   } else {
     push(esi);
   }
-
-  // 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());