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

src/frames-inl.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 50 matching lines @@
 
 inline bool StackHandler::includes(Address address) const {
   Address start = this->address();
   Address end = start + StackHandlerConstants::kSize;
   return start <= address && address <= end;
 }
 
 
 inline void StackHandler::Iterate(ObjectVisitor* v, Code* holder) const {
   v->VisitPointer(context_address());
-  v->VisitPointer(code_address());
+  StackFrame::IteratePc(v, pc_address(), holder);
 }
 
 
 inline StackHandler* StackHandler::FromAddress(Address address) {
   return reinterpret_cast<StackHandler*>(address);
 }
 
 
 inline bool StackHandler::is_entry() const {
-  return kind() == ENTRY;
+  return state() == ENTRY;
 }
 
 
 inline bool StackHandler::is_try_catch() const {
-  return kind() == TRY_CATCH;
+  return state() == TRY_CATCH;
 }
 
 
 inline bool StackHandler::is_try_finally() const {
-  return kind() == TRY_FINALLY;
+  return state() == TRY_FINALLY;
 }
 
 
-inline StackHandler::Kind StackHandler::kind() const {
+inline StackHandler::State StackHandler::state() const {
   const int offset = StackHandlerConstants::kStateOffset;
-  return KindField::decode(Memory::unsigned_at(address() + offset));
+  return static_cast<State>(Memory::int_at(address() + offset));
 }
 
 
 inline Object** StackHandler::context_address() const {
   const int offset = StackHandlerConstants::kContextOffset;
   return reinterpret_cast<Object**>(address() + offset);
 }
 
 
-inline Object** StackHandler::code_address() const {
-  const int offset = StackHandlerConstants::kCodeOffset;
-  return reinterpret_cast<Object**>(address() + offset);
+inline Address* StackHandler::pc_address() const {
+  const int offset = StackHandlerConstants::kPCOffset;
+  return reinterpret_cast<Address*>(address() + offset);
 }
 
 
 inline StackFrame::StackFrame(StackFrameIterator* iterator)
     : iterator_(iterator), isolate_(iterator_->isolate()) {
 }
 
 
 inline StackHandler* StackFrame::top_handler() const {
   return iterator_->handler();
@@ skipping 199 matching lines @@
 template<typename Iterator>
 void JavaScriptFrameIteratorTemp<Iterator>::Reset() {
   iterator_.Reset();
   if (!done()) Advance();
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FRAMES_INL_H_