Rebase of partial ia32 implementation of optimized try/catch (started by Kevin Millikin, continued …

src/frames-inl.h

 // Copyright 2012 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 41 matching lines @@
   return reinterpret_cast<Address>(const_cast<StackHandler*>(this));
 }
 
 
 inline StackHandler* StackHandler::next() const {
   const int offset = StackHandlerConstants::kNextOffset;
   return FromAddress(Memory::Address_at(address() + offset));
 }
 
 
+inline Code* StackHandler::code() const {
+  return Code::cast(*code_address());
+}
+
+
 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());
 }
 
 
 inline StackHandler* StackHandler::FromAddress(Address address) {
   return reinterpret_cast<StackHandler*>(address);
 }
 
 
 inline bool StackHandler::is_js_entry() const {
   return kind() == JS_ENTRY;
 }
 
 
 inline bool StackHandler::is_catch() const {
-  return kind() == CATCH;
+  return kind() == CATCH || kind() == OPTIMIZED_CATCH;
 }
 
 
 inline bool StackHandler::is_finally() const {
   return kind() == FINALLY;
 }
 
 
+inline bool StackHandler::is_optimized() const {
+  return (kind() & kIsOptimizedMask) != 0;
+}
+
+
 inline StackHandler::Kind StackHandler::kind() const {
   const int offset = StackHandlerConstants::kStateOffset;
   return KindField::decode(Memory::unsigned_at(address() + offset));
 }
 
 
 inline unsigned StackHandler::index() const {
   const int offset = StackHandlerConstants::kStateOffset;
   return IndexField::decode(Memory::unsigned_at(address() + offset));
 }
@@ skipping 226 matching lines @@
   // adaptor frames.
   StackFrame* frame = iterator_.frame();
   ASSERT(frame->is_java_script());
   return static_cast<JavaScriptFrame*>(frame);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FRAMES_INL_H_