[Isolates] Merge 6500:6700 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 26 matching lines @@
 #include "execution.h"
 #include "frames.h"
 #include "global-handles.h"
 #include "handles.h"
 #include "heap.h"
 #include "regexp-stack.h"
 #include "runtime-profiler.h"
 #include "runtime.h"
 #include "zone.h"
 
-
 namespace v8 {
 namespace internal {
 
 class AstSentinels;
 class Bootstrapper;
 class CodeGenerator;
 class CodeRange;
 class CompilationCache;
 class ContextSlotCache;
 class ContextSwitcher;
@@ skipping 17 matching lines @@
 class SaveContext;
 class ScannerConstants;
 class StringInputBuffer;
 class StringTracker;
 class StubCache;
 class ThreadManager;
 class ThreadState;
 class ThreadVisitor;  // Defined in v8threads.h
 class VMState;
 
-typedef void* ExternalReferenceRedirector(void* original, bool fp_return);
+// 'void function pointer', used to roundtrip the 
+// ExternalReference::ExternalReferenceRedirector since we can not include
+// assembler.h, where it is defined, here.
+typedef void* ExternalReferenceRedirectorPointer();
 
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
 class Debug;
 class Debugger;
 class DebuggerAgent;
 #endif
 
 #if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
 class Redirection;
@@ skipping 185 matching lines @@
   /* Assembler state. */                                                       \
   /* A previously allocated buffer of kMinimalBufferSize bytes, or NULL. */    \
   V(byte*, assembler_spare_buffer, NULL)                                       \
   /*This static counter ensures that NativeAllocationCheckers can be nested.*/ \
   V(int, allocation_disallowed, 0)                                             \
   V(FatalErrorCallback, exception_behavior, NULL)                              \
   V(v8::Debug::MessageHandler, message_handler, NULL)                          \
   /* To distinguish the function templates, so that we can find them in the */ \
   /* function cache of the global context. */                                  \
   V(int, next_serial_number, 0)                                                \
-  V(ExternalReferenceRedirector*, external_reference_redirector, NULL)         \
+  V(ExternalReferenceRedirectorPointer*, external_reference_redirector, NULL)  \
   V(bool, always_allow_natives_syntax, false)                                  \
   /* Part of the state of liveedit. */                                         \
   V(FunctionInfoListener*, active_function_info_listener, NULL)                \
   /* State for Relocatable. */                                                 \
   V(Relocatable*, relocatable_top, NULL)                                       \
   /* State for CodeEntry in profile-generator. */                              \
   V(CodeGenerator*, current_code_generator, NULL)                              \
   V(bool, jump_target_compiling_deferred_code, false)                          \
   V(DebugObjectCache*, string_stream_debug_object_cache, NULL)                 \
   V(Object*, string_stream_current_security_token, NULL)                       \
@@ skipping 306 matching lines @@
   Failure* ReThrow(MaybeObject* exception, MessageLocation* location = NULL);
   void ScheduleThrow(Object* exception);
   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);
-  bool ShouldReturnException(bool* is_caught_externally,
+  // Checks if exception should be reported and finds out if it's
+  // caught externally.
+  bool ShouldReportException(bool* is_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_