[Isolates] Merge 6700:7030 from bleeding_edge to isolates.

src/isolate.h

 // Copyright 2010 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 92 matching lines @@
 // this table of handles to the actual constants.
 // Static indirection table for handles to constants.  If a Result
 // represents a constant, the data contains an index into this table
 // of handles to the actual constants.
 typedef ZoneList<Handle<Object> > ZoneObjectList;
 
 #define RETURN_IF_SCHEDULED_EXCEPTION(isolate)    \
   if (isolate->has_scheduled_exception())         \
       return isolate->PromoteScheduledException()
 
+#define RETURN_IF_EMPTY_HANDLE_VALUE(isolate, call, value) \
+  if (call.is_null()) {                                    \
+    ASSERT(isolate->has_pending_exception());              \
+    return value;                                          \
+  }
+
+#define RETURN_IF_EMPTY_HANDLE(isolate, call)                       \
+  RETURN_IF_EMPTY_HANDLE_VALUE(isolate, call, Failure::Exception())
+
 #define ISOLATE_ADDRESS_LIST(C)            \
   C(handler_address)                       \
   C(c_entry_fp_address)                    \
   C(context_address)                       \
   C(pending_exception_address)             \
   C(external_caught_exception_address)
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 #define ISOLATE_ADDRESS_LIST_PROF(C)       \
   C(js_entry_sp_address)
@@ skipping 385 matching lines @@
     ASSERT(has_scheduled_exception());
     return thread_local_top_.scheduled_exception_;
   }
   bool has_scheduled_exception() {
     return !thread_local_top_.scheduled_exception_->IsTheHole();
   }
   void clear_scheduled_exception() {
     thread_local_top_.scheduled_exception_ = heap_.the_hole_value();
   }
 
-  void setup_external_caught() {
-    thread_local_top_.external_caught_exception_ =
-        has_pending_exception() &&
-        (thread_local_top_.catcher_ != NULL) &&
-        (try_catch_handler() == thread_local_top_.catcher_);
+  bool IsExternallyCaught();
+
+  bool is_catchable_by_javascript(MaybeObject* exception) {
+    return (exception != Failure::OutOfMemoryException()) &&
+        (exception != heap()->termination_exception());
   }
 
   // JS execution stack (see frames.h).
   static Address c_entry_fp(ThreadLocalTop* thread) {
     return thread->c_entry_fp_;
   }
   static Address handler(ThreadLocalTop* thread) { return thread->handler_; }
 
   inline Address* c_entry_fp_address() {
     return &thread_local_top_.c_entry_fp_;
@@ skipping 79 matching lines @@
   void ReportPendingMessages();
   Failure* ThrowIllegalOperation();
 
   // Promote a scheduled exception to pending. Asserts has_scheduled_exception.
   Failure* PromoteScheduledException();
   void DoThrow(MaybeObject* exception,
                MessageLocation* location,
                const char* message);
   // Checks if exception should be reported and finds out if it's
   // caught externally.
-  bool ShouldReportException(bool* is_caught_externally,
+  bool ShouldReportException(bool* can_be_caught_externally,
                              bool catchable_by_javascript);
 
   // Attempts to compute the current source location, storing the
   // result in the target out parameter.
   void ComputeLocation(MessageLocation* target);
 
   // Override command line flag.
   void TraceException(bool flag);
 
   // Out of resource exception helpers.
@@ skipping 624 matching lines @@
 
 } }  // namespace v8::internal
 
 // TODO(isolates): Get rid of these -inl.h includes and place them only where
 //                 they're needed.
 #include "allocation-inl.h"
 #include "zone-inl.h"
 #include "frames-inl.h"
 
 #endif  // V8_ISOLATE_H_