Make exception thrown via v8 public API propagate to v8::TryCatch as JS thrown exceptions do.

src/top.h

 // Copyright 2006-2008 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 222 matching lines @@
     ASSERT(has_scheduled_exception());
     return thread_local_.scheduled_exception_;
   }
   static bool has_scheduled_exception() {
     return !thread_local_.scheduled_exception_->IsTheHole();
   }
   static void clear_scheduled_exception() {
     thread_local_.scheduled_exception_ = Heap::the_hole_value();
   }
 
-  static void setup_external_caught() {
-    thread_local_.external_caught_exception_ =
-        has_pending_exception() &&
-        (thread_local_.catcher_ != NULL) &&
-        (try_catch_handler() == thread_local_.catcher_);
-  }
-
   static void SetCaptureStackTraceForUncaughtExceptions(
       bool capture,
       int frame_limit,
       StackTrace::StackTraceOptions options);
 
   // Tells whether the current context has experienced an out of memory
   // exception.
   static bool is_out_of_memory();
 
   // JS execution stack (see frames.h).
@@ skipping 185 matching lines @@
 
   static inline ThreadLocalTop* GetCurrentThread() { return &thread_local_; }
   static int ArchiveSpacePerThread() { return sizeof(ThreadLocalTop); }
   static char* ArchiveThread(char* to);
   static char* RestoreThread(char* from);
   static void FreeThreadResources() { thread_local_.Free(); }
 
   static const char* kStackOverflowMessage;
 
  private:
+
+  static void setup_external_caught() {
+    thread_local_.external_caught_exception_ =
+        has_pending_exception() &&
+        (thread_local_.catcher_ != NULL) &&
+        (try_catch_handler() == thread_local_.catcher_);
+  }
+
+  // Attempts to propagate the pending exception to the proper v8::TryCatch.
+  static void PropagatePendingExceptionToExteranlTryCatch();

[Mads Ager (chromium), 2011/01/28 11:39:18]

Exteranl -> External

[antonm, 2011/01/28 13:37:25]

Done.

+
 #ifdef ENABLE_VMSTATE_TRACKING
   // Set of states used when communicating with the runtime profiler.
   //
   // The set of possible transitions is divided between the VM and the
   // profiler threads.
   //
   // The VM thread can perform these transitions:
   //   o IN_JS -> NOT_IN_JS
   //   o NOT_IN_JS -> IN_JS
   //   o NOT_IN_JS_WAITING_FOR_JS -> IN_JS notifying the profiler thread
@@ skipping 125 matching lines @@
   static void Unlock() { Top::break_access_->Unlock(); }
 
   static bool TryLock() {
     return Top::break_access_->TryLock();
   }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_TOP_H_