- Remove the reply_port from the VM internal message object.

runtime/bin/vmservice_impl.cc

Index: runtime/bin/vmservice_impl.cc
===================================================================
--- runtime/bin/vmservice_impl.cc	(revision 31195)
+++ runtime/bin/vmservice_impl.cc	(working copy)
@@ -491,8 +491,7 @@
   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));
@@ -502,19 +501,7 @@
   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;
@@ -522,7 +509,7 @@
   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));
 }
 
@@ -535,7 +522,7 @@
 
 
 static VmServiceNativeEntry _VmServiceNativeEntries[] = {
-  {"VMService_SendServiceMessage", 3, SendServiceMessage}
+  {"VMService_SendServiceMessage", 2, SendServiceMessage}
 };