Reapply "Add a level of indirection to exception handler addresses."

src/frames.h

Index: src/frames.h
diff --git a/src/frames.h b/src/frames.h
index 778b803168f4d10629021fd1be3fb09d77db7694..2c5e571ed7e33864d29888161d3295762b8e6d6e 100644
--- a/src/frames.h
+++ b/src/frames.h
@@ -84,12 +84,17 @@ class InnerPointerToCodeCache {
 
 class StackHandler BASE_EMBEDDED {
  public:
-  enum State {
+  enum Kind {
     ENTRY,
     TRY_CATCH,
     TRY_FINALLY
   };
 
+  static const int kKindWidth = 2;
+  static const int kOffsetWidth = 32 - kKindWidth;
+  class KindField: public BitField<StackHandler::Kind, 0, kKindWidth> {};
+  class OffsetField: public BitField<unsigned, kKindWidth, kOffsetWidth> {};
+
   // Get the address of this stack handler.
   inline Address address() const;
 
@@ -112,10 +117,10 @@ class StackHandler BASE_EMBEDDED {
 
  private:
   // Accessors.
-  inline State state() const;
+  inline Kind kind() const;
 
   inline Object** context_address() const;
-  inline Address* pc_address() const;
+  inline Object** code_address() const;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StackHandler);
 };