Return an unhandled exception error on an OOM or other errors while

vm/isolate.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "lib/mirrors.h"
 #include "vm/compiler_stats.h"
@@ skipping 32 matching lines @@
   bool HandleMessage(Message* message);
 
 #if defined(DEBUG)
   // Check that it is safe to access this handler.
   void CheckAccess();
 #endif
   bool IsCurrentIsolate() const;
   virtual Isolate* GetIsolate() const { return isolate_; }
 
  private:
+  bool ProcessUnhandledException(const Object& result);
+
   Isolate* isolate_;
 };
 
 
 IsolateMessageHandler::IsolateMessageHandler(Isolate* isolate)
     : isolate_(isolate) {
 }
 
 
 IsolateMessageHandler::~IsolateMessageHandler() {
@@ skipping 19 matching lines @@
 
 bool IsolateMessageHandler::HandleMessage(Message* message) {
   StartIsolateScope start_scope(isolate_);
   StackZone zone(isolate_);
   HandleScope handle_scope(isolate_);
 
   // Parse the message.
   SnapshotReader reader(message->data(), message->len(),
                         Snapshot::kMessage, Isolate::Current());
   const Object& msg_obj = Object::Handle(reader.ReadObject());
+  if (msg_obj.IsError()) {
+    // An error occurred while reading the message.
+    return ProcessUnhandledException(msg_obj);
+  }
   if (!msg_obj.IsNull() && !msg_obj.IsInstance()) {
     // TODO(turnidge): We need to decide what an isolate does with
     // malformed messages.  If they (eventually) come from a remote
     // machine, then it might make sense to drop the message entirely.
     // In the case that the message originated locally, which is
     // always true for now, then this should never occur.
     UNREACHABLE();
   }
 
   Instance& msg = Instance::Handle();
   msg ^= msg_obj.raw();  // Can't use Instance::Cast because may be null.
 
   if (message->IsOOB()) {
     // For now the only OOB messages are Mirrors messages.
     HandleMirrorsMessage(isolate_, message->reply_port(), msg);
     delete message;
   } else {
     const Object& result = Object::Handle(
         DartLibraryCalls::HandleMessage(
             message->dest_port(), message->reply_port(), msg));
     delete message;
-    if (result.IsError() || result.IsUnhandledException()) {
-      if (result.IsError()) {
-        isolate_->object_store()->set_sticky_error(Error::Cast(result));
-      }
-      if (Isolate::UnhandledExceptionCallback() != NULL) {
-        Dart_EnterScope();
-        Dart_Handle error = Api::NewHandle(isolate_, result.raw());
-        (Isolate::UnhandledExceptionCallback())(error);
-        Dart_ExitScope();
-      }
-      return false;
+    if (result.IsError()) {
+      return ProcessUnhandledException(result);
     }
     ASSERT(result.IsNull());
   }
   return true;
 }
 
 
 #if defined(DEBUG)
 void IsolateMessageHandler::CheckAccess() {
   ASSERT(IsCurrentIsolate());
 }
 #endif
 
 
 bool IsolateMessageHandler::IsCurrentIsolate() const {
   return (isolate_ == Isolate::Current());
 }
 
 
+bool IsolateMessageHandler::ProcessUnhandledException(const Object& result) {
+  isolate_->object_store()->set_sticky_error(Error::Cast(result));
+  // Invoke the dart unhandled exception callback if there is one.
+  if (Isolate::UnhandledExceptionCallback() != NULL) {
+    Dart_EnterScope();
+    Dart_Handle error = Api::NewHandle(isolate_, result.raw());
+    (Isolate::UnhandledExceptionCallback())(error);
+    Dart_ExitScope();
+  }
+  return false;
+}
+
+
 #if defined(DEBUG)
 // static
 void BaseIsolate::AssertCurrent(BaseIsolate* isolate) {
   ASSERT(isolate == Isolate::Current());
 }
 #endif
 
 
 Isolate::Isolate()
     : store_buffer_block_(),
@@ skipping 348 matching lines @@
 
 
 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor,
                                          bool visit_prologue_weak_handles) {
   if (api_state() != NULL) {
     api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles);
   }
 }
 
 }  // namespace dart