Dart_PropagateError, take 2.

runtime/lib/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 "platform/assert.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 63 matching lines @@
   name ^= String::New(":");
   str ^= String::Concat(str, name);
   name ^= String::NewSymbol(class_name);
   str ^= String::Concat(str, name);
   GrowableArray<const Object*> arguments(1);
   arguments.Add(&str);
   Exceptions::ThrowByType(type, arguments);
 }
 
 
-RawInstance* ReceivePortCreate(intptr_t port_id) {
+// TODO(turnidge): Move to DartLibraryCalls.
+RawObject* ReceivePortCreate(intptr_t port_id) {
   const String& class_name =
       String::Handle(String::NewSymbol("ReceivePortImpl"));
   const String& function_name =
       String::Handle(String::NewSymbol("_get_or_create"));
   const int kNumArguments = 1;
   const Array& kNoArgumentNames = Array::Handle();
   const Function& function = Function::Handle(
       Resolver::ResolveStatic(Library::Handle(Library::CoreLibrary()),
                               class_name,
                               function_name,
                               kNumArguments,
                               kNoArgumentNames,
                               Resolver::kIsQualified));
   GrowableArray<const Object*> arguments(kNumArguments);
   arguments.Add(&Integer::Handle(Integer::New(port_id)));
-  const Instance& result = Instance::Handle(
+  const Object& result = Object::Handle(
       DartEntry::InvokeStatic(function, arguments, kNoArgumentNames));
-  if (result.IsError()) {
-    ProcessError(result);
-  } else {
+  if (!result.IsError()) {
     PortMap::SetLive(port_id);
   }
   return result.raw();
 }
 
 
-static RawInstance* SendPortCreate(intptr_t port_id) {
+// TODO(turnidge): Move to DartLibraryCalls.
+static RawObject* SendPortCreate(intptr_t port_id) {
   const String& class_name = String::Handle(String::NewSymbol("SendPortImpl"));
   const String& function_name = String::Handle(String::NewSymbol("_create"));
   const int kNumArguments = 1;
   const Array& kNoArgumentNames = Array::Handle();
   const Function& function = Function::Handle(
       Resolver::ResolveStatic(Library::Handle(Library::CoreLibrary()),
                               class_name,
                               function_name,
                               kNumArguments,
                               kNoArgumentNames,
                               Resolver::kIsQualified));
   GrowableArray<const Object*> arguments(kNumArguments);
   arguments.Add(&Integer::Handle(Integer::New(port_id)));
-  const Instance& result = Instance::Handle(
+  const Object& result = Object::Handle(
       DartEntry::InvokeStatic(function, arguments, kNoArgumentNames));
   return result.raw();
 }
 
 
 static void RunIsolate(uword parameter) {
   IsolateStartData* data = reinterpret_cast<IsolateStartData*>(parameter);
   Isolate* isolate = data->isolate_;
   char* library_url = data->library_url_;
   char* class_name = data->class_name_;
@@ skipping 41 matching lines @@
       }
       ASSERT(result.IsNull());
     }
 
     // Invoke the "_run" method.
     const Function& target_function = Function::Handle(Resolver::ResolveDynamic(
         target, String::Handle(String::NewSymbol("_run")), 2, 0));
     // TODO(iposva): Proper error checking here.
     ASSERT(!target_function.IsNull());
     // TODO(iposva): Allocate the proper port number here.
-    const Instance& local_port = Instance::Handle(ReceivePortCreate(port_id));
+    const Object& local_port = Object::Handle(ReceivePortCreate(port_id));
+    if (local_port.IsError()) {
+      ProcessError(local_port);
+    }
     GrowableArray<const Object*> arguments(1);
     arguments.Add(&local_port);
     const Array& kNoArgumentNames = Array::Handle();
     result = DartEntry::InvokeDynamic(target,
                                       target_function,
                                       arguments,
                                       kNoArgumentNames);
     if (result.IsError()) {
       ProcessError(result);
     }
@@ skipping 125 matching lines @@
 
   // Switch back to the original isolate and return.
   Isolate::SetCurrent(preserved_isolate);
   if (spawned_isolate == NULL) {
     // Unable to spawn isolate correctly, throw exception.
     ThrowErrorException(Exceptions::kIllegalArgument,
                         error,
                         library_url,
                         class_name);
   }
-  const Instance& port = Instance::Handle(SendPortCreate(port_id));
+
+  // TODO(turnidge): Move this code up before we launch the new
+  // thread.  That way we won't have a thread hanging around that we
+  // can't talk to.
+  const Object& port = Object::Handle(SendPortCreate(port_id));
   if (port.IsError()) {
-    if (port.IsUnhandledException()) {
-      ThrowErrorException(Exceptions::kInternalError,
-                          "Unable to create send port to isolate",
-                          library_url,
-                          class_name);
-    } else {
-      ProcessError(port);
-    }
+    Exceptions::PropagateError(port);
   }
   arguments->SetReturn(port);
 }
 
 
 DEFINE_NATIVE_ENTRY(ReceivePortImpl_factory, 1) {
   ASSERT(AbstractTypeArguments::CheckedHandle(arguments->At(0)).IsNull());
   intptr_t port_id =
       PortMap::CreatePort(arguments->isolate()->message_handler());
-  const Instance& port = Instance::Handle(ReceivePortCreate(port_id));
+  const Object& port = Object::Handle(ReceivePortCreate(port_id));
+  if (port.IsError()) {
+    Exceptions::PropagateError(port);
+  }
   arguments->SetReturn(port);
 }
 
 
 DEFINE_NATIVE_ENTRY(ReceivePortImpl_closeInternal, 1) {
   intptr_t id = Smi::CheckedHandle(arguments->At(0)).Value();
   PortMap::ClosePort(id);
 }
 
 
 DEFINE_NATIVE_ENTRY(SendPortImpl_sendInternal_, 3) {
   intptr_t send_id = Smi::CheckedHandle(arguments->At(0)).Value();
   intptr_t reply_id = Smi::CheckedHandle(arguments->At(1)).Value();
   // TODO(iposva): Allow for arbitrary messages to be sent.
   uint8_t* data = SerializeObject(Instance::CheckedHandle(arguments->At(2)));
 
   // TODO(turnidge): Throw an exception when the return value is false?
   PortMap::PostMessage(new Message(
       send_id, reply_id, data, Message::kNormalPriority));
 }
 
 }  // namespace dart