Revert r7258 and r7260.

src/messages.cc

 
 // 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
@@ skipping 91 matching lines @@
                                   script_handle,
                                   stack_trace_handle,
                                   stack_frames_handle);
 
   return message;
 }
 
 
 void MessageHandler::ReportMessage(MessageLocation* loc,
                                    Handle<Object> message) {
-  // We are calling into embedder's code which can throw exceptions.
-  // Thus we need to save current exception state, reset it to the clean one
-  // and ignore scheduled exceptions callbacks can throw.
-  Top::ExceptionScope exception_scope;
-  Top::clear_pending_exception();
-  Top::set_external_caught_exception(false);
-
   v8::Local<v8::Message> api_message_obj = v8::Utils::MessageToLocal(message);
 
   v8::NeanderArray global_listeners(Factory::message_listeners());
   int global_length = global_listeners.length();
   if (global_length == 0) {
     DefaultMessageReport(loc, message);
-    if (Top::has_scheduled_exception()) {
-      // Consider logging it somehow.
-      Top::clear_scheduled_exception();
-    }
   } else {
     for (int i = 0; i < global_length; i++) {
       HandleScope scope;
       if (global_listeners.get(i)->IsUndefined()) continue;
       v8::NeanderObject listener(JSObject::cast(global_listeners.get(i)));
       Handle<Proxy> callback_obj(Proxy::cast(listener.get(0)));
       v8::MessageCallback callback =
           FUNCTION_CAST<v8::MessageCallback>(callback_obj->proxy());
       Handle<Object> callback_data(listener.get(1));
       callback(api_message_obj, v8::Utils::ToLocal(callback_data));
-      if (Top::has_scheduled_exception()) {
-        // Consider logging it somehow.
-        Top::clear_scheduled_exception();
-      }
     }
   }
 }
 
 
 Handle<String> MessageHandler::GetMessage(Handle<Object> data) {
   Handle<String> fmt_str = Factory::LookupAsciiSymbol("FormatMessage");
   Handle<JSFunction> fun =
       Handle<JSFunction>(JSFunction::cast(
           Top::builtins()->GetPropertyNoExceptionThrown(*fmt_str)));
@@ skipping 17 matching lines @@
 }
 
 
 SmartPointer<char> MessageHandler::GetLocalizedMessage(Handle<Object> data) {
   HandleScope scope;
   return GetMessage(data)->ToCString(DISALLOW_NULLS);
 }
 
 
 } }  // namespace v8::internal