Revert of Cleanup and unify Isolate::ReportPendingMessages.

src/isolate.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_ISOLATE_H_
 #define V8_ISOLATE_H_
 
 #include <queue>
 #include "include/v8-debug.h"
 #include "src/allocation.h"
@@ skipping 749 matching lines @@
   // Find the correct handler for the current pending exception. This also
   // clears and returns the current pending exception.
   Object* FindHandler();
 
   // Tries to predict whether the exception will be caught. Note that this can
   // only produce an estimate, because it is undecidable whether a finally
   // clause will consume or re-throw an exception. We conservatively assume any
   // finally clause will behave as if the exception were consumed.
   bool PredictWhetherExceptionIsCaught(Object* exception);
 
-  // Propagate pending exception message to potential v8::TryCatch. Also call
-  // message handlers when the exception is guaranteed not to be caught.
-  void ReportPendingMessages();
-
   void ScheduleThrow(Object* exception);
   // Re-set pending message, script and positions reported to the TryCatch
   // back to the TLS for re-use when rethrowing.
   void RestorePendingMessageFromTryCatch(v8::TryCatch* handler);
   // Un-schedule an exception that was caught by a TryCatch handler.
   void CancelScheduledExceptionFromTryCatch(v8::TryCatch* handler);
+  void ReportPendingMessages();
   // Return pending location if any or unfilled structure.
   MessageLocation GetMessageLocation();
 
   // Promote a scheduled exception to pending. Asserts has_scheduled_exception.
   Object* PromoteScheduledException();
 
   // Attempts to compute the current source location, storing the
   // result in the target out parameter.
   void ComputeLocation(MessageLocation* target);
   bool ComputeLocationFromException(MessageLocation* target,
@@ skipping 421 matching lines @@
 
   void InitializeThreadLocal();
 
   void MarkCompactPrologue(bool is_compacting,
                            ThreadLocalTop* archived_thread_data);
   void MarkCompactEpilogue(bool is_compacting,
                            ThreadLocalTop* archived_thread_data);
 
   void FillCache();
 
+  // Propagate pending exception message to the v8::TryCatch.
+  // If there is no external try-catch or message was successfully propagated,
+  // then return true.
+  bool PropagatePendingExceptionToExternalTryCatch();
+
   // Traverse prototype chain to find out whether the object is derived from
   // the Error object.
   bool IsErrorObject(Handle<Object> obj);
 
   base::Atomic32 id_;
   EntryStackItem* entry_stack_;
   int stack_trace_nesting_level_;
   StringStream* incomplete_message_;
   Address isolate_addresses_[kIsolateAddressCount + 1];  // NOLINT
   Bootstrapper* bootstrapper_;
@@ skipping 330 matching lines @@
   }
 
   EmbeddedVector<char, 128> filename_;
   FILE* file_;
   int scope_depth_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_ISOLATE_H_