- Remove the reply_port from the VM internal message object.

runtime/vm/dart_entry.cc

 // Copyright (c) 2011, 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/dart_entry.h"
 
 #include "vm/class_finalizer.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/debugger.h"
@@ skipping 383 matching lines @@
   }
   const Array& args = Array::Handle(Array::New(kNumArguments));
   args.SetAt(0, Integer::Handle(Integer::New(port_id)));
   const Object& result =
       Object::Handle(DartEntry::InvokeFunction(function, args));
   return result.raw();
 }
 
 
 RawObject* DartLibraryCalls::HandleMessage(const Object& receive_port,
-                                           Dart_Port reply_port_id,
                                            const Instance& message) {
   Isolate* isolate = Isolate::Current();
-  Function& function =
-      Function::Handle(isolate,
-                       isolate->object_store()->handle_message_function());
-  const int kNumArguments = 3;
+  Function& function = Function::Handle(isolate,
+      isolate->object_store()->handle_message_function());
+  const int kNumArguments = 2;
   if (function.IsNull()) {
-    Library& isolate_lib = Library::Handle(Library::IsolateLibrary());
+    Library& isolate_lib = Library::Handle(isolate, Library::IsolateLibrary());
     ASSERT(!isolate_lib.IsNull());
-    const String& class_name =
-        String::Handle(isolate_lib.PrivateName(Symbols::_RawReceivePortImpl()));
-    const String& function_name =
-        String::Handle(isolate_lib.PrivateName(Symbols::_handleMessage()));
+    const String& class_name = String::Handle(isolate,
+        isolate_lib.PrivateName(Symbols::_RawReceivePortImpl()));
+    const String& function_name = String::Handle(isolate,
+        isolate_lib.PrivateName(Symbols::_handleMessage()));
     function = Resolver::ResolveStatic(isolate_lib,
                                        class_name,
                                        function_name,
                                        kNumArguments,
                                        Object::empty_array());
     ASSERT(!function.IsNull());
     isolate->object_store()->set_handle_message_function(function);
   }
   const Array& args = Array::Handle(isolate, Array::New(kNumArguments));
   args.SetAt(0, receive_port);
-  args.SetAt(1, Integer::Handle(isolate, Integer::New(reply_port_id)));
-  args.SetAt(2, message);
+  args.SetAt(1, message);
   if (isolate->debugger()->IsStepping()) {
     // If the isolate is being debugged and the debugger was stepping
     // through code, enable single stepping so debugger will stop
     // at the first location the user is interested in.
     isolate->debugger()->SetSingleStep();
   }
-  const Object& result =
-      Object::Handle(isolate, DartEntry::InvokeFunction(function, args));
+  const Object& result = Object::Handle(isolate,
+      DartEntry::InvokeFunction(function, args));
   ASSERT(result.IsNull() || result.IsError());
   return result.raw();
 }
 
 
 RawObject* DartLibraryCalls::NewSendPort(intptr_t port_id) {
   Library& isolate_lib = Library::Handle(Library::IsolateLibrary());
   ASSERT(!isolate_lib.IsNull());
   const String& class_name =
       String::Handle(isolate_lib.PrivateName(Symbols::_SendPortImpl()));
@@ skipping 42 matching lines @@
           String::Handle(Field::GetterName(Symbols::_id()))));
   const Function& func = Function::Handle(cls.LookupDynamicFunction(func_name));
   ASSERT(!func.IsNull());
   const Array& args = Array::Handle(Array::New(1));
   args.SetAt(0, port);
   return DartEntry::InvokeFunction(func, args);
 }
 
 
 }  // namespace dart