- Add possibility to redirect messages if they were not delivered.

runtime/vm/service_test.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 "platform/globals.h"
 
 #include "include/dart_debugger_api.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 72 matching lines @@
   }
 
   const char* msg() const { return _msg; }
 
  private:
   char* _msg;
 };
 
 
 static RawInstance* Eval(Dart_Handle lib, const char* expr) {
-  Dart_Handle result = Dart_EvaluateExpr(lib, NewString(expr));
-  EXPECT_VALID(result);
+  Dart_Handle expr_val = Dart_EvaluateExpr(lib, NewString(expr));
+  EXPECT_VALID(expr_val);
   Isolate* isolate = Isolate::Current();
-  const Instance& instance = Api::UnwrapInstanceHandle(isolate, result);
-  return instance.raw();
+  const GrowableObjectArray& value =
+      Api::UnwrapGrowableObjectArrayHandle(isolate, expr_val);
+  const Array& result = Array::Handle(Array::MakeArray(value));
+  GrowableObjectArray& growable = GrowableObjectArray::Handle();
+  growable ^= result.At(3);
+  Array& array = Array::Handle(Array::MakeArray(growable));
+  result.SetAt(3, array);
+  growable ^= result.At(4);
+  array = Array::MakeArray(growable);
+  result.SetAt(4, array);
+  return result.raw();
 }
 
 
 static RawInstance* EvalF(Dart_Handle lib, const char* fmt, ...) {
   Isolate* isolate = Isolate::Current();
 
   va_list args;
   va_start(args, fmt);
   intptr_t len = OS::VSNPrint(NULL, 0, fmt, args);
   va_end(args);
@@ skipping 60 matching lines @@
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Get the isolate summary.
-  service_msg = Eval(lib, "[port, [], [], []]");
+  service_msg = Eval(lib, "[0, port, [], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
 
   JSONReader reader(handler.msg());
 
   const int kBufferSize = 128;
   char buffer[kBufferSize];
 
   // Check that the response string is somewhat sane.
 
@@ skipping 34 matching lines @@
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Get the stacktrace.
-  service_msg = Eval(lib, "[port, ['stacktrace'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['stacktrace'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"StackTrace\",\"id\":\"stacktrace\",\"members\":[]}",
       handler.msg());
 
   // Malformed request.
-  service_msg = Eval(lib, "[port, ['stacktrace', 'jamboree'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['stacktrace', 'jamboree'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Command too long\","
       "\"request\":{\"arguments\":[\"stacktrace\",\"jamboree\"],"
       "\"option_keys\":[],\"option_values\":[]}}",
       handler.msg());
 }
 
 
@@ skipping 15 matching lines @@
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Add a breakpoint.
   const String& url = String::Handle(String::New(TestCase::url()));
   isolate->debugger()->SetBreakpointAtLine(url, 3);
 
   // Get the breakpoint list.
-  service_msg = Eval(lib, "[port, ['debug', 'breakpoints'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['debug', 'breakpoints'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"BreakpointList\",\"breakpoints\":[{"
           "\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true,"
           "\"resolved\":false,"
           "\"location\":{\"type\":\"Location\","
                         "\"script\":\"test-lib\",\"tokenPos\":5}}]}",
       handler.msg());
 
   // Individual breakpoint.
-  service_msg = Eval(lib, "[port, ['debug', 'breakpoints', '1'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['debug', 'breakpoints', '1'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true,"
        "\"resolved\":false,"
        "\"location\":{\"type\":\"Location\","
                      "\"script\":\"test-lib\",\"tokenPos\":5}}",
       handler.msg());
 
   // Missing sub-command.
-  service_msg = Eval(lib, "[port, ['debug'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['debug'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\","
        "\"message\":\"Must specify a subcommand\","
        "\"request\":{\"arguments\":[\"debug\"],\"option_keys\":[],"
                     "\"option_values\":[]}}",
       handler.msg());
 
   // Unrecognized breakpoint.
-  service_msg = Eval(lib, "[port, ['debug', 'breakpoints', '1111'], [], []]");
+  service_msg = Eval(lib,
+                     "[0, port, ['debug', 'breakpoints', '1111'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
                 "\"message\":\"Unrecognized breakpoint id 1111\","
                 "\"request\":{"
                     "\"arguments\":[\"debug\",\"breakpoints\",\"1111\"],"
                     "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 
   // Command too long.
   service_msg =
-      Eval(lib, "[port, ['debug', 'breakpoints', '1111', 'green'], [], []]");
+      Eval(lib, "[0, port, ['debug', 'breakpoints', '1111', 'green'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
                 "\"message\":\"Command too long\","
                 "\"request\":{\"arguments\":[\"debug\",\"breakpoints\","
                                             "\"1111\",\"green\"],"
                              "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 
   // Unrecognized subcommand.
-  service_msg = Eval(lib, "[port, ['debug', 'nosferatu'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['debug', 'nosferatu'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
                 "\"message\":\"Unrecognized subcommand 'nosferatu'\","
                 "\"request\":{\"arguments\":[\"debug\",\"nosferatu\"],"
                              "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 }
 
 
@@ skipping 25 matching lines @@
     arr.SetAt(0, str);
   }
   intptr_t arr_id = ring->GetIdForObject(arr.raw());
   Dart_Handle valid_id = Dart_NewInteger(arr_id);
   EXPECT_VALID(valid_id);
   EXPECT_VALID(Dart_SetField(lib, NewString("validId"), valid_id));
 
   Instance& service_msg = Instance::Handle();
 
   // null
-  service_msg = Eval(lib, "[port, ['objects', 'null'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', 'null'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/null\","
       "\"valueAsString\":\"null\"}",
       handler.msg());
 
   // not initialized
-  service_msg = Eval(lib, "[port, ['objects', 'not-initialized'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', 'not-initialized'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/not-initialized\","
       "\"valueAsString\":\"<not initialized>\"}",
       handler.msg());
 
   // being initialized
-  service_msg = Eval(lib, "[port, ['objects', 'being-initialized'], [], []]");
+  service_msg = Eval(lib,
+                     "[0, port, ['objects', 'being-initialized'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/being-initialized\","
       "\"valueAsString\":\"<being initialized>\"}",
       handler.msg());
 
   // optimized out
-  service_msg = Eval(lib, "[port, ['objects', 'optimized-out'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', 'optimized-out'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/optimized-out\","
       "\"valueAsString\":\"<optimized out>\"}",
       handler.msg());
 
   // collected
-  service_msg = Eval(lib, "[port, ['objects', 'collected'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', 'collected'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/collected\","
       "\"valueAsString\":\"<collected>\"}",
       handler.msg());
 
   // expired
-  service_msg = Eval(lib, "[port, ['objects', 'expired'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', 'expired'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/expired\","
       "\"valueAsString\":\"<expired>\"}",
       handler.msg());
 
   // bool
-  service_msg = Eval(lib, "[port, ['objects', 'bool-true'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', 'bool-true'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Bool\",\"id\":\"objects\\/bool-true\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/46\","
       "\"user_name\":\"bool\"},\"valueAsString\":\"true\"}",
       handler.msg());
 
   // int
-  service_msg = Eval(lib, "[port, ['objects', 'int-123'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', 'int-123'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
       "\"user_name\":\"_Smi\"},"
       "\"fields\":[],"
       "\"id\":\"objects\\/int-123\","
       "\"valueAsString\":\"123\"}",
       handler.msg());
 
   // object id ring / valid
-  service_msg = Eval(lib, "[port, ['objects', '$validId'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', '$validId'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   handler.filterMsg("size");
   handler.filterMsg("id");
   EXPECT_STREQ(
       "{\"type\":\"Array\","
       "\"class\":{\"type\":\"@Class\",\"user_name\":\"_List\"},"
       "\"fields\":[],"
       "\"length\":1,"
       "\"elements\":[{"
           "\"index\":0,"
           "\"value\":{\"type\":\"@String\","
           "\"class\":{\"type\":\"@Class\",\"user_name\":\"_OneByteString\"},"
           "\"valueAsString\":\"\\\"value\\\"\"}}]}",
       handler.msg());
 
   // object id ring / invalid => expired
-  service_msg = Eval(lib, "[port, ['objects', '99999999'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', '99999999'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/expired\","
       "\"valueAsString\":\"<expired>\"}",
       handler.msg());
 
   // expired/eval => error
-  service_msg = Eval(lib, "[port, ['objects', 'expired', 'eval'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['objects', 'expired', 'eval'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\","
       "\"message\":\"expected at most 2 arguments but found 3\\n\","
       "\"request\":{\"arguments\":[\"objects\",\"expired\",\"eval\"],"
       "\"option_keys\":[],\"option_values\":[]}}",
       handler.msg());
 
   // int/eval => good
   service_msg = Eval(lib,
-                     "[port, ['objects', 'int-123', 'eval'], "
+                     "[0, port, ['objects', 'int-123', 'eval'], "
                      "['expr'], ['this+99']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
       "\"user_name\":\"_Smi\"},"
       "\"id\":\"objects\\/int-222\","
       "\"valueAsString\":\"222\"}",
       handler.msg());
 
   // eval returning null works
   service_msg = Eval(lib,
-                     "[port, ['objects', 'int-123', 'eval'], "
+                     "[0, port, ['objects', 'int-123', 'eval'], "
                      "['expr'], ['null']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"@Null\",\"id\":\"objects\\/null\","
       "\"valueAsString\":\"null\"}",
       handler.msg());
 
   // object id ring / invalid => expired
-  service_msg = Eval(lib, "[port, ['objects', '99999999', 'eval'], "
+  service_msg = Eval(lib, "[0, port, ['objects', '99999999', 'eval'], "
                      "['expr'], ['this']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\",\"kind\":\"EvalExpired\","
       "\"message\":\"attempt to evaluate against expired object\\n\","
       "\"request\":{\"arguments\":[\"objects\",\"99999999\",\"eval\"],"
       "\"option_keys\":[\"expr\"],\"option_values\":[\"this\"]}}",
       handler.msg());
 
   // Extra arg to eval.
   service_msg = Eval(lib,
-                     "[port, ['objects', 'int-123', 'eval', 'foo'], "
+                     "[0, port, ['objects', 'int-123', 'eval', 'foo'], "
                      "['expr'], ['this+99']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\","
       "\"message\":\"expected at most 3 arguments but found 4\\n\","
       "\"request\":{\"arguments\":[\"objects\",\"int-123\",\"eval\",\"foo\"],"
       "\"option_keys\":[\"expr\"],\"option_values\":[\"this+99\"]}}",
       handler.msg());
 
   // Retained by single instance.
   service_msg = Eval(lib,
-                     "[port, ['objects', '$validId', 'retained'], [], []]");
+                     "[0, port, ['objects', '$validId', 'retained'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"objects\\/int-%" Pd "\"",
                    arr.raw()->Size() + arr.At(0)->Size());
 
   // Retaining path to 'arr', limit 1.
   service_msg = Eval(
       lib,
-      "[port, ['objects', '$validId', 'retaining_path'], ['limit'], ['1']]");
+      "[0, port, ['objects', '$validId', 'retaining_path'], ['limit'], ['1']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
       "{\"type\":\"RetainingPath\",\"id\":\"retaining_path\",\"length\":1,"
       "\"elements\":[{\"index\":0,\"value\":{\"type\":\"@Array\"");
 
   // Retaining path missing limit.
   service_msg = Eval(
       lib,
-      "[port, ['objects', '$validId', 'retaining_path'], [], []]");
+      "[0, port, ['objects', '$validId', 'retaining_path'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(), "{\"type\":\"Error\"");
 
   // eval against list containing an internal object.
   Object& internal_object = Object::Handle();
   internal_object = LiteralToken::New();
   arr.SetAt(0, internal_object);
   service_msg = Eval(lib,
-                     "[port, ['objects', '$validId', 'eval'], "
+                     "[0, port, ['objects', '$validId', 'eval'], "
                      "['expr'], ['toString()']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(), "\"type\":\"Error\"");
   ExpectSubstringF(
       handler.msg(),
       "\"message\":\"attempt to evaluate against internal VM object\\n\"");
 }
 
 
@@ skipping 27 matching lines @@
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request library.
   service_msg = EvalF(h_lib,
-                      "[port, ['libraries', '%" Pd "'], [], []]", lib_id);
+                      "[0, port, ['libraries', '%" Pd "'], [], []]", lib_id);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Library\"", handler.msg());
   EXPECT_SUBSTRING("\"url\":\"test-lib\"", handler.msg());
 
   // Evaluate an expression from a library.
   service_msg = EvalF(h_lib,
-                      "[port, ['libraries', '%" Pd "', 'eval'], "
+                      "[0, port, ['libraries', '%" Pd "', 'eval'], "
                       "['expr'], ['libVar - 1']]", lib_id);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
       "\"user_name\":\"_Smi\"},\"id\":\"objects\\/int-54320\","
       "\"valueAsString\":\"54320\"}",
       handler.msg());
@@ skipping 36 matching lines @@
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request an invalid class id.
-  service_msg = Eval(h_lib, "[port, ['classes', '999999'], [], []]");
+  service_msg = Eval(h_lib, "[0, port, ['classes', '999999'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"id\":\"\","
     "\"message\":\"999999 is not a valid class id.\","
     "\"request\":{\"arguments\":[\"classes\",\"999999\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // Request the class A over the service.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "'], [], []]", cid);
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Class\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\",\"name\":\"A\",", cid);
 
   // Evaluate an expression from class A.
   service_msg = EvalF(h_lib,
-                      "[port, ['classes', '%" Pd "', 'eval'], "
+                      "[0, port, ['classes', '%" Pd "', 'eval'], "
                       "['expr'], ['cobra + 100000']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
       "\"user_name\":\"_Smi\"},"
       "\"id\":\"objects\\/int-111235\","
       "\"valueAsString\":\"111235\"}",
       handler.msg());
 
   // Request function 0 from class A.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '0'],"
-                              "[], []]", cid);
+  service_msg = EvalF(h_lib,
+                      "[0, port, ['classes', '%" Pd "', 'functions', '0'],"
+                      "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Function\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/functions\\/0\","
                    "\"name\":\"get:a\",", cid);
 
   // Request field 0 from class A.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'fields', '0'],"
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'fields', '0'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Field\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/fields\\/0\","
                    "\"name\":\"a\",", cid);
 
   // Invalid sub command.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'huh', '0'],"
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'huh', '0'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Invalid sub collection huh\""
     ",\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"huh\",\"0\"],\"option_keys\":[],"
     "\"option_values\":[]}}", cid);
 
   // Invalid field request.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'fields', '9'],"
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'fields', '9'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Field 9 not found\","
     "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function request.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '9'],"
-                              "[], []]", cid);
+  service_msg = EvalF(h_lib,
+                      "[0, port, ['classes', '%" Pd "', 'functions', '9'],"
+                    "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Function 9 not found\","
     "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
 
   // Invalid field subcommand.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'fields', '9', 'x']"
-                             ",[], []]", cid);
+  service_msg = EvalF(h_lib,
+                      "[0, port, ['classes', '%" Pd "', 'fields', '9', 'x']"
+                      ",[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Command too long\","
     "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function request.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '9',"
-                             "'x'], [], []]", cid);
+  service_msg = EvalF(h_lib,
+                      "[0, port, ['classes', '%" Pd "', 'functions', '9',"
+                      "'x'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Command too long\","
     "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Retained size of all instances of class B.
   const Class& class_b = Class::Handle(GetClass(lib, "B"));
   EXPECT(!class_b.IsNull());
   const Instance& b0 = Instance::Handle(Instance::New(class_b));
   const Instance& b1 = Instance::Handle(Instance::New(class_b));
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'retained'],"
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'retained'],"
                       "[], []]", class_b.id());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"objects\\/int-%" Pd "\"",
                    b0.raw()->Size() + b1.raw()->Size());
 }
 
 
 TEST_CASE(Service_Types) {
@@ skipping 21 matching lines @@
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request the class A over the service.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "'], [], []]", cid);
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Class\"", handler.msg());
   EXPECT_SUBSTRING("\"name\":\"A\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\"", cid);
 
   // Request canonical type 0 from class A.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'types', '0'],"
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'types', '0'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Type\"", handler.msg());
   EXPECT_SUBSTRING("\"name\":\"A<bool>\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/types\\/0\"", cid);
 
   // Request canonical type 1 from class A.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'types', '1'],"
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'types', '1'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Type\"", handler.msg());
   EXPECT_SUBSTRING("\"name\":\"A<A<bool>>\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/types\\/1\"", cid);
 
   // Request for non-existent canonical type from class A.
-  service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'types', '42'],"
+  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'types', '42'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\","
     "\"message\":\"Canonical type 42 not found\""
     ",\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"types\",\"42\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Request canonical type arguments. Expect <A<bool>> to be listed.
-  service_msg = EvalF(h_lib, "[port, ['typearguments'],"
+  service_msg = EvalF(h_lib, "[0, port, ['typearguments'],"
                               "[], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"TypeArgumentsList\"", handler.msg());
   ExpectSubstringF(handler.msg(), "\"name\":\"<A<bool>>\",");
 
   // Request canonical type arguments with instantiations.
-  service_msg = EvalF(h_lib, "[port, ['typearguments', 'withinstantiations'],"
-                              "[], []]");
+  service_msg = EvalF(h_lib,
+                      "[0, port, ['typearguments', 'withinstantiations'],"
+                      "[], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"TypeArgumentsList\"", handler.msg());
 }
 
 
 TEST_CASE(Service_Code) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
@@ skipping 34 matching lines @@
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request an invalid code object.
-  service_msg = Eval(h_lib, "[port, ['code', '0'], [], []]");
+  service_msg = Eval(h_lib, "[0, port, ['code', '0'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Malformed code id: 0\","
     "\"request\":{\"arguments\":[\"code\",\"0\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // The following test checks that a code object can be found only
   // at compile_timestamp()-code.EntryPoint().
-  service_msg = EvalF(h_lib, "[port, ['code', '%" Px64"-%" Px "'], [], []]",
+  service_msg = EvalF(h_lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
                       compile_timestamp,
                       entry);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     // Only perform a partial match.
     const intptr_t kBufferSize = 512;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
                 "{\"type\":\"Code\",\"id\":\"code\\/%" Px64 "-%" Px "\",",
                 compile_timestamp,
                 entry);
     EXPECT_SUBSTRING(buffer, handler.msg());
   }
 
   // Request code object at compile_timestamp-code.EntryPoint() + 16
   // Expect this to fail because the address is not the entry point.
   uintptr_t address = entry + 16;
-  service_msg = EvalF(h_lib, "[port, ['code', '%" Px64"-%" Px "'], [], []]",
+  service_msg = EvalF(h_lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
                       compile_timestamp,
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     // Only perform a partial match.
     const intptr_t kBufferSize = 512;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
                 "Could not find code with id: %" Px64 "-%" Px "",
                 compile_timestamp,
                 address);
     EXPECT_SUBSTRING(buffer, handler.msg());
   }
 
   // Request code object at (compile_timestamp - 1)-code.EntryPoint()
   // Expect this to fail because the timestamp is wrong.
   address = entry;
-  service_msg = EvalF(h_lib, "[port, ['code', '%" Px64"-%" Px "'], [], []]",
+  service_msg = EvalF(h_lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
                       compile_timestamp - 1,
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     // Only perform a partial match.
     const intptr_t kBufferSize = 512;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
                 "Could not find code with id: %" Px64 "-%" Px "",
                 compile_timestamp - 1,
                 address);
     EXPECT_SUBSTRING(buffer, handler.msg());
   }
 
   // Request native code at address. Expect the null code object back.
   address = last;
-  service_msg = EvalF(h_lib, "[port, ['code', 'native-%" Px "'], [], []]",
+  service_msg = EvalF(h_lib, "[0, port, ['code', 'native-%" Px "'], [], []]",
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Null\",\"id\":\"objects\\/null\","
                "\"valueAsString\":\"null\"}",
                handler.msg());
 
   // Request malformed native code.
-  service_msg = EvalF(h_lib, "[port, ['code', 'native%" Px "'], [], []]",
+  service_msg = EvalF(h_lib, "[0, port, ['code', 'native%" Px "'], [], []]",
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"message\":\"Malformed code id:", handler.msg());
 }
 
 
 TEST_CASE(Service_VM) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "main() {\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(lib, "[port, ['vm'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['vm'], [], []]");
 
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"VM\",\"id\":\"vm\"", handler.msg());
   EXPECT_SUBSTRING("\"targetCPU\"", handler.msg());
   EXPECT_SUBSTRING("\"hostCPU\"", handler.msg());
   EXPECT_SUBSTRING("\"version\"", handler.msg());
   EXPECT_SUBSTRING("\"uptime\"", handler.msg());
   EXPECT_SUBSTRING("\"isolates\"", handler.msg());
 }
@@ skipping 11 matching lines @@
   EXPECT_VALID(lib);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(lib, "[port, ['flags'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['flags'], [], []]");
 
   // Make sure we can get the FlagList.
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"FlagList\",\"id\":\"flags\"", handler.msg());
   EXPECT_SUBSTRING(
       "\"name\":\"service_testing_flag\",\"comment\":\"Comment\","
       "\"flagType\":\"bool\",\"valueAsString\":\"false\"",
       handler.msg());
 
   // Modify a flag through the vm service.
   service_msg = Eval(lib,
-                     "[port, ['flags', 'set'], "
+                     "[0, port, ['flags', 'set'], "
                      "['name', 'value'], ['service_testing_flag', 'true']]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("Success", handler.msg());
 
   // Make sure that the flag changed.
-  service_msg = Eval(lib, "[port, ['flags'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['flags'], [], []]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING(
       "\"name\":\"service_testing_flag\",\"comment\":\"Comment\","
       "\"flagType\":\"bool\",\"valueAsString\":\"true\"",
       handler.msg());
 }
 
 
 TEST_CASE(Service_Scripts) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "main() {\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
   Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(h_lib);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(h_lib, "[port, ['scripts', 'test-lib'], [], []]");
+  service_msg = Eval(h_lib, "[0, port, ['scripts', 'test-lib'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Script\",\"id\":\"scripts\\/test-lib\","
        "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
        "\"kind\":\"script\","
        "\"source\":\"var port;\\n\\nmain() {\\n}\","
        "\"tokenPosTable\":[[1,0,1,1,5,2,9],[3,5,1,6,5,7,6,8,8],[4,10,1]]}",
       handler.msg());
 }
@@ skipping 22 matching lines @@
   EXPECT_VALID(result);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(h_lib, "[port, ['coverage'], [], []]");
+  service_msg = Eval(h_lib, "[0, port, ['coverage'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING(
       "{\"source\":\"test-lib\",\"script\":{"
       "\"type\":\"@Script\",\"id\":\"scripts\\/test-lib\","
       "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
       "\"kind\":\"script\"},\"hits\":"
       "[5,1,6,1]}", handler.msg());
 }
 
@@ skipping 20 matching lines @@
   EXPECT_VALID(result);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(h_lib, "[port, ['allocationprofile'], [], []]");
+  service_msg = Eval(h_lib, "[0, port, ['allocationprofile'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
   // Too long.
-  service_msg = Eval(h_lib, "[port, ['allocationprofile', 'foo'], [], []]");
+  service_msg = Eval(h_lib, "[0, port, ['allocationprofile', 'foo'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Bad gc option.
-  service_msg = Eval(h_lib, "[port, ['allocationprofile'], ['gc'], ['cat']]");
+  service_msg = Eval(h_lib,
+                     "[0, port, ['allocationprofile'], ['gc'], ['cat']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Bad reset option.
-  service_msg = Eval(h_lib, "[port, ['allocationprofile'], ['reset'], ['ff']]");
+  service_msg = Eval(h_lib,
+                     "[0, port, ['allocationprofile'], ['reset'], ['ff']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Good reset.
   service_msg =
-      Eval(h_lib, "[port, ['allocationprofile'], ['reset'], ['true']]");
+      Eval(h_lib, "[0, port, ['allocationprofile'], ['reset'], ['true']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
   // Good GC.
   service_msg =
-      Eval(h_lib, "[port, ['allocationprofile'], ['gc'], ['full']]");
+      Eval(h_lib, "[0, port, ['allocationprofile'], ['gc'], ['full']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
   // Good GC and reset.
   service_msg = Eval(h_lib,
-      "[port, ['allocationprofile'], ['gc', 'reset'], ['full', 'true']]");
+      "[0, port, ['allocationprofile'], ['gc', 'reset'], ['full', 'true']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 }
 
 
 TEST_CASE(Service_HeapMap) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "main() {\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(lib, "[port, ['heapmap'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['heapmap'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"HeapMap\"", handler.msg());
   EXPECT_SUBSTRING("\"pages\":[", handler.msg());
 }
 
 
 TEST_CASE(Service_Address) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
@@ skipping 14 matching lines @@
 
   const String& str = String::Handle(String::New("foobar", Heap::kOld));
   Instance& service_msg = Instance::Handle();
   // Note: If we ever introduce old space compaction, this test might fail.
   uword start_addr = RawObject::ToAddr(str.raw());
   // Expect to find 'str', also from internal addresses.
   for (int offset = 0; offset < kObjectAlignment; ++offset) {
     uword addr = start_addr + offset;
     char buf[1024];
     OS::SNPrint(buf, sizeof(buf),
-                "[port, ['address', '%" Px "'], [], []]", addr);
+                "[0, port, ['address', '%" Px "'], [], []]", addr);
     service_msg = Eval(lib, buf);
     Service::HandleIsolateMessage(isolate, service_msg);
     handler.HandleNextMessage();
     EXPECT_SUBSTRING("\"type\":\"@String\"", handler.msg());
     EXPECT_SUBSTRING("foobar", handler.msg());
   }
   // Expect null when no object is found.
-  service_msg = Eval(lib, "[port, ['address', '7'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['address', '7'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // TODO(turnidge): Should this be a ServiceException instead?
   EXPECT_STREQ("{\"type\":\"@Null\",\"id\":\"objects\\/null\","
                "\"valueAsString\":\"null\"}",
                handler.msg());
 }
 
 
 static const char* alpha_callback(
@@ skipping 41 matching lines @@
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(lib, "[port, ['alpha'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['alpha'], [], []]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("alpha", handler.msg());
-  service_msg = Eval(lib, "[port, ['beta'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['beta'], [], []]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("beta", handler.msg());
 }
 
 TEST_CASE(Service_EmbedderIsolateHandler) {
   const char* kScript =
     "var port;\n"  // Set to our mock port by C++.
     "\n"
     "var x = 7;\n"
@@ skipping 12 matching lines @@
   EXPECT_VALID(result);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(lib, "[port, ['alpha'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['alpha'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("alpha", handler.msg());
-  service_msg = Eval(lib, "[port, ['beta'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['beta'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("beta", handler.msg());
 }
 
 
 // TODO(zra): Remove when tests are ready to enable.
 #if !defined(TARGET_ARCH_ARM64)
 
 TEST_CASE(Service_Profile) {
@@ skipping 16 matching lines @@
   EXPECT_VALID(result);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(h_lib, "[port, ['profile'], [], []]");
+  service_msg = Eval(h_lib, "[0, port, ['profile'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect profile
   EXPECT_SUBSTRING("\"type\":\"Profile\"", handler.msg());
 
-  service_msg = Eval(h_lib, "[port, ['profile'], ['tags'], ['hide']]");
+  service_msg = Eval(h_lib, "[0, port, ['profile'], ['tags'], ['hide']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect profile
   EXPECT_SUBSTRING("\"type\":\"Profile\"", handler.msg());
 
-  service_msg = Eval(h_lib, "[port, ['profile'], ['tags'], ['hidden']]");
+  service_msg = Eval(h_lib, "[0, port, ['profile'], ['tags'], ['hidden']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect error.
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 #endif  // !defined(TARGET_ARCH_ARM64)
 
 }  // namespace dart