Fix decoration of ObjectPool references to stubs broken by their movement to VM isolate.

runtime/vm/service.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 "vm/service.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 #include "platform/globals.h"
 
@@ skipping 2576 matching lines @@
     PrintInvalidParamError(js, "address");
     return true;
   }
   bool ref = js->HasParam("ref") && js->ParamIs("ref", "true");
   Object& object = Object::Handle(isolate);
   {
     NoSafepointScope no_safepoint;
     ContainsAddressVisitor visitor(isolate, addr);
     object = isolate->heap()->FindObject(&visitor);
   }
-  if (object.IsNull()) {
-    PrintSentinel(js, kFreeSentinel);
-  } else {
+
+  if (!object.IsNull()) {
     object.PrintJSON(js, ref);
+    return true;
   }
+
+  {
+    NoSafepointScope no_safepoint;
+    ContainsAddressVisitor visitor(Dart::vm_isolate(), addr);
+    object = Dart::vm_isolate()->heap()->FindObject(&visitor);

[Cutch, 2015/07/23 23:59:25]

Maybe refactor the FindObject calls into a helper:

Object& object = FindObjectHelper(addr);

Which checks both the current and vm isolates for the address.

[rmacnak, 2015/07/24 00:17:45]

Done.

+  }
+
+  if (!object.IsNull()) {
+    object.PrintJSON(js, ref);
+    return true;
+  }
+
+  PrintSentinel(js, kFreeSentinel);
   return true;
 }
 
 
 static const MethodParameter* get_ports_params[] = {
   ISOLATE_PARAMETER,
   NULL,
 };
 
 
@@ skipping 436 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart