- Remove the reply_port from the VM internal message object.

runtime/bin/vmservice_impl.cc

 // Copyright (c) 2013, 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 "bin/vmservice_impl.h"
 
 #include "include/dart_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 473 matching lines @@
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 
 static void SendServiceMessage(Dart_NativeArguments args) {
   NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
   Isolate* isolate = arguments->isolate();
   StackZone zone(isolate);
   HANDLESCOPE(isolate);
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, sp, arguments->NativeArgAt(0));
-  GET_NON_NULL_NATIVE_ARGUMENT(Instance, rp, arguments->NativeArgAt(1));
-  GET_NON_NULL_NATIVE_ARGUMENT(Instance, message, arguments->NativeArgAt(2));
+  GET_NON_NULL_NATIVE_ARGUMENT(Instance, message, arguments->NativeArgAt(1));
 
   // Extract SendPort port id.
   const Object& sp_id_obj = Object::Handle(DartLibraryCalls::PortGetId(sp));
   if (sp_id_obj.IsError()) {
     Exceptions::PropagateError(Error::Cast(sp_id_obj));
   }
   Integer& id = Integer::Handle();
   id ^= sp_id_obj.raw();
   Dart_Port sp_id = static_cast<Dart_Port>(id.AsInt64Value());
-
-  // Extract ReceivePort port id.
-  const Object& rp_id_obj = Object::Handle(DartLibraryCalls::PortGetId(rp));
-  if (rp_id_obj.IsError()) {
-    Exceptions::PropagateError(Error::Cast(rp_id_obj));
-  }
-  ASSERT(rp_id_obj.IsSmi() || rp_id_obj.IsMint());
-  id ^= rp_id_obj.raw();
-  Dart_Port rp_id = static_cast<Dart_Port>(id.AsInt64Value());
-
-  // Both are valid ports.
   ASSERT(sp_id != ILLEGAL_PORT);
-  ASSERT(rp_id != ILLEGAL_PORT);
 
   // Serialize message.
   uint8_t* data = NULL;
   MessageWriter writer(&data, &allocator);
   writer.WriteMessage(message);
 
   // TODO(turnidge): Throw an exception when the return value is false?
-  PortMap::PostMessage(new Message(sp_id, rp_id, data, writer.BytesWritten(),
+  PortMap::PostMessage(new Message(sp_id, data, writer.BytesWritten(),
                                    Message::kOOBPriority));
 }
 
 
 struct VmServiceNativeEntry {
   const char* name;
   int num_arguments;
   Dart_NativeFunction function;
 };
 
 
 static VmServiceNativeEntry _VmServiceNativeEntries[] = {
-  {"VMService_SendServiceMessage", 3, SendServiceMessage}
+  {"VMService_SendServiceMessage", 2, SendServiceMessage}
 };
 
 
 static Dart_NativeFunction VmServiceNativeResolver(Dart_Handle name,
                                                    int num_arguments) {
   const Object& obj = Object::Handle(Api::UnwrapHandle(name));
   if (!obj.IsString()) {
     return NULL;
   }
   const char* function_name = obj.ToCString();
   ASSERT(function_name != NULL);
   intptr_t n =
       sizeof(_VmServiceNativeEntries) / sizeof(_VmServiceNativeEntries[0]);
   for (intptr_t i = 0; i < n; i++) {
     VmServiceNativeEntry entry = _VmServiceNativeEntries[i];
     if (!strcmp(function_name, entry.name) &&
         (num_arguments == entry.num_arguments)) {
       return entry.function;
     }
   }
   return NULL;
 }
 
 }  // namespace bin
 }  // namespace dart