Revert of Remove kind field from StackHandler.

src/frames.h

 // 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.
 
 #ifndef V8_FRAMES_H_
 #define V8_FRAMES_H_
 
 #include "src/allocation.h"
 #include "src/handles.h"
 #include "src/safepoint-table.h"
@@ skipping 70 matching lines @@
   static const int kSlotCount = kSize >> kPointerSizeLog2;
 };
 
 
 class StackHandler BASE_EMBEDDED {
  public:
   enum Kind {
     JS_ENTRY,
     CATCH,
     FINALLY,
+    LAST_KIND = FINALLY
   };
 
+  static const int kKindWidth = 2;
+  STATIC_ASSERT(LAST_KIND < (1 << kKindWidth));
+  static const int kIndexWidth = 32 - kKindWidth;
+  class KindField: public BitField<StackHandler::Kind, 0, kKindWidth> {};
+  class IndexField: public BitField<unsigned, kKindWidth, kIndexWidth> {};
+
   // Get the address of this stack handler.
   inline Address address() const;
 
   // Get the next stack handler in the chain.
   inline StackHandler* next() const;
 
   // Tells whether the given address is inside this handler.
   inline bool includes(Address address) const;
 
   // Garbage collection support.
   inline void Iterate(ObjectVisitor* v, Code* holder) const;
 
   // Conversion support.
   static inline StackHandler* FromAddress(Address address);
 
   // Accessors.
   inline Context* context() const;
-  inline int index() const;
+  inline Kind kind() const;
+  inline unsigned index() const;
+
+  // Testers.
+  inline bool is_js_entry() const;
+  inline bool is_catch() const;
+  inline bool is_finally() const;
 
   // Generator support to preserve stack handlers.
   void Unwind(Isolate* isolate, FixedArray* array, int offset,
               int previous_handler_offset) const;
   int Rewind(Isolate* isolate, FixedArray* array, int offset, Address fp);
 
  private:
   inline Object** context_address() const;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StackHandler);
@@ skipping 798 matching lines @@
 };
 
 
 // Reads all frames on the current stack and copies them into the current
 // zone memory.
 Vector<StackFrame*> CreateStackMap(Isolate* isolate, Zone* zone);
 
 } }  // namespace v8::internal
 
 #endif  // V8_FRAMES_H_