Fix for issue 21398 (only send "literal like" objects across isolates spawned using spawnURI

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 84 matching lines @@
   return Smi::New(hash);
 }
 
 
 DEFINE_NATIVE_ENTRY(SendPortImpl_sendInternal_, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(SendPort, port, arguments->NativeArgAt(0));
   // TODO(iposva): Allow for arbitrary messages to be sent.
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, obj, arguments->NativeArgAt(1));
 
   uint8_t* data = NULL;
-  MessageWriter writer(&data, &allocator);
+  bool can_send_any_object = (isolate->origin_id() == port.origin_id());
+  MessageWriter writer(&data, &allocator, can_send_any_object);
   writer.WriteMessage(obj);
 
   // TODO(turnidge): Throw an exception when the return value is false?
   PortMap::PostMessage(new Message(port.Id(),
                                    data, writer.BytesWritten(),
                                    Message::kNormalPriority));
   return Object::null();
 }
 
 
@@ skipping 55 matching lines @@
   Isolate* child_isolate = reinterpret_cast<Isolate*>(
       (callback)(state->script_url(),
                  state->function_name(),
                  state->package_root(),
                  init_data,
                  error));
   if (child_isolate == NULL) {
     Isolate::SetCurrent(parent_isolate);
     return false;
   }
+  if (!state->is_spawn_uri()) {
+    // For isolates spawned using the spawnFunction semantics we set
+    // the origin_id to the origin_id of the parent isolate.
+    child_isolate->set_origin_id(parent_isolate->origin_id());
+  }
   state->set_isolate(reinterpret_cast<Isolate*>(child_isolate));
 
   Isolate::SetCurrent(parent_isolate);
   return true;
 }
 
 
-static RawObject* Spawn(Isolate* parent_isolate,
-                        IsolateSpawnState* state) {
+static void Spawn(Isolate* parent_isolate, IsolateSpawnState* state) {
   // Create a new isolate.
   char* error = NULL;
   if (!CreateIsolate(parent_isolate, state, &error)) {
     delete state;
     const String& msg = String::Handle(String::New(error));
     free(error);
     ThrowIsolateSpawnException(msg);
   }
 
-  // Create a SendPort for the new isolate.
+  // Start the new isolate if it is already marked as runnable.
   Isolate* spawned_isolate = state->isolate();
-  const SendPort& port = SendPort::Handle(
-      SendPort::New(spawned_isolate->main_port()));
-
-  // Start the new isolate if it is already marked as runnable.
   MutexLocker ml(spawned_isolate->mutex());
   spawned_isolate->set_spawn_state(state);
   if (spawned_isolate->is_runnable()) {
     spawned_isolate->Run();
   }
-
-  return port.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Isolate_spawnFunction, 4) {
   GET_NON_NULL_NATIVE_ARGUMENT(SendPort, port, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, closure, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, message, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(Bool, paused, arguments->NativeArgAt(3));
   if (closure.IsClosure()) {
     Function& func = Function::Handle();
     func = Closure::function(closure);
     if (func.IsImplicitClosureFunction() && func.is_static()) {
 #if defined(DEBUG)
       Context& ctx = Context::Handle();
       ctx = Closure::context(closure);
       ASSERT(ctx.num_variables() == 0);
 #endif
-      return Spawn(isolate, new IsolateSpawnState(
-          port.Id(), func, message, paused.value()));
+      Spawn(isolate, new IsolateSpawnState(port.Id(),
+                                           func,
+                                           message,
+                                           paused.value()));
+      return Object::null();
     }
   }
   const String& msg = String::Handle(String::New(
       "Isolate.spawn expects to be passed a static or top-level function"));
   Exceptions::ThrowArgumentError(msg);
   return Object::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 6) {
@@ skipping 17 matching lines @@
 
   char* utf8_package_root = NULL;
   if (!package_root.IsNull()) {
     const intptr_t len = Utf8::Length(package_root);
     Zone* zone = isolate->current_zone();
     utf8_package_root = zone->Alloc<char>(len + 1);
     package_root.ToUTF8(reinterpret_cast<uint8_t*>(utf8_package_root), len);
     utf8_package_root[len] = '\0';
   }
 
-  return Spawn(isolate, new IsolateSpawnState(port.Id(),
-                                              canonical_uri,
-                                              utf8_package_root,
-                                              args,
-                                              message,
-                                              paused.value()));
+  Spawn(isolate, new IsolateSpawnState(port.Id(),
+                                       canonical_uri,
+                                       utf8_package_root,
+                                       args,
+                                       message,
+                                       paused.value()));
+  return Object::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(Isolate_getPortAndCapabilitiesOfCurrentIsolate, 0) {
   const Array& result = Array::Handle(Array::New(3));
   result.SetAt(0, SendPort::Handle(SendPort::New(isolate->main_port())));
   result.SetAt(1, Capability::Handle(
                       Capability::New(isolate->pause_capability())));
   result.SetAt(2, Capability::Handle(
                       Capability::New(isolate->terminate_capability())));
   return result.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Isolate_sendOOB, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(SendPort, port, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Array, msg, arguments->NativeArgAt(1));
 
   // Make sure to route this request to the isolate library OOB mesage handler.
   msg.SetAt(0, Smi::Handle(Smi::New(Message::kIsolateLibOOBMsg)));
 
   uint8_t* data = NULL;
-  MessageWriter writer(&data, &allocator);
+  MessageWriter writer(&data, &allocator, false);
   writer.WriteMessage(msg);
 
   PortMap::PostMessage(new Message(port.Id(),
                                    data, writer.BytesWritten(),
                                    Message::kOOBPriority));
   return Object::null();
 }
 
 }  // namespace dart