Display ICData entries at call sites, with links to the targets and guarded classes.

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 "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 1537 matching lines @@
 
   const char* expr = js->LookupParam("expression");
   const String& expr_str = String::Handle(isolate, String::New(expr));
 
   const Object& result = Object::Handle(frame->Evaluate(expr_str));
   result.PrintJSON(js, true);
   return true;
 }
 
 
-static const MethodParameter* get_call_site_data_params[] = {
-  ISOLATE_PARAMETER,
-  new IdParameter("targetId", true),
-  NULL,
-};
-
-
-static bool GetCallSiteData(Isolate* isolate, JSONStream* js) {
-  const char* target_id = js->LookupParam("targetId");
-  Object& obj = Object::Handle(LookupHeapObject(isolate, target_id, NULL));
-  if (obj.raw() == Object::sentinel().raw()) {
-    PrintInvalidParamError(js, "targetId");
-    return true;
-  }
-  if (obj.IsFunction()) {
-    const Function& func = Function::Cast(obj);
-    const GrowableObjectArray& ics =
-        GrowableObjectArray::Handle(func.CollectICsWithSourcePositions());
-    JSONObject jsobj(js);
-    jsobj.AddProperty("type", "_CallSiteData");
-    jsobj.AddProperty("function", func);
-    JSONArray elements(&jsobj, "callSites");
-    ICData& ic_data = ICData::Handle();
-    Smi& token_pos = Smi::Handle();
-    for (intptr_t i = 0; i < ics.Length();) {
-      ic_data ^= ics.At(i++);
-      token_pos ^= ics.At(i++);
-      ic_data.PrintToJSONArray(&elements, token_pos.Value());
-    }
-    return true;
-  }
-  return false;
-}
-
-
 class GetInstancesVisitor : public ObjectGraph::Visitor {
  public:
   GetInstancesVisitor(const Class& cls, const Array& storage)
       : cls_(cls), storage_(storage), count_(0) {}
 
   virtual Direction VisitObject(ObjectGraph::StackIterator* it) {
     RawObject* raw_obj = it->Get();
     if (raw_obj->IsFreeListElement()) {
       return kProceed;
     }
@@ skipping 121 matching lines @@
                                const Script& script,
                                const Class& cls,
                                const Function& func) const {
     return func.raw() == func_.raw();
   }
  private:
   const Function& func_;
 };
 
 
-static const MethodParameter* get_coverage_params[] = {
-  ISOLATE_PARAMETER,
-  NULL,
-};
-
-
-static bool GetCoverage(Isolate* isolate, JSONStream* js) {
+static bool GetHitsOrSites(Isolate* isolate, JSONStream* js, bool as_sites) {
   if (!js->HasParam("targetId")) {
-    CodeCoverage::PrintJSON(isolate, js, NULL);
+    CodeCoverage::PrintJSON(isolate, js, NULL, as_sites);
     return true;
   }
   const char* target_id = js->LookupParam("targetId");
   Object& obj = Object::Handle(LookupHeapObject(isolate, target_id, NULL));
   if (obj.raw() == Object::sentinel().raw()) {
     PrintInvalidParamError(js, "targetId");
     return true;
   }
   if (obj.IsScript()) {
     ScriptCoverageFilter sf(Script::Cast(obj));
-    CodeCoverage::PrintJSON(isolate, js, &sf);
+    CodeCoverage::PrintJSON(isolate, js, &sf, as_sites);
     return true;
   }
   if (obj.IsLibrary()) {
     LibraryCoverageFilter lf(Library::Cast(obj));
-    CodeCoverage::PrintJSON(isolate, js, &lf);
+    CodeCoverage::PrintJSON(isolate, js, &lf, as_sites);
     return true;
   }
   if (obj.IsClass()) {
     ClassCoverageFilter cf(Class::Cast(obj));
-    CodeCoverage::PrintJSON(isolate, js, &cf);
+    CodeCoverage::PrintJSON(isolate, js, &cf, as_sites);
     return true;
   }
   if (obj.IsFunction()) {
     FunctionCoverageFilter ff(Function::Cast(obj));
-    CodeCoverage::PrintJSON(isolate, js, &ff);
+    CodeCoverage::PrintJSON(isolate, js, &ff, as_sites);
     return true;
   }
   PrintError(js, "%s: Invalid 'targetId' parameter value: "
              "id '%s' does not correspond to a "
              "script, library, class, or function", js->method(), target_id);
   return true;
 }
 
 
+static const MethodParameter* get_coverage_params[] = {
+  ISOLATE_PARAMETER,
+  NULL,
+};
+
+
+static bool GetCoverage(Isolate* isolate, JSONStream* js) {

[Cutch, 2015/03/18 19:53:52]

Add a TODO here to remove this.

[rmacnak, 2015/03/18 20:06:47]

Done.

+  return GetHitsOrSites(isolate, js, false);
+}
+
+
+static const MethodParameter* get_call_site_data_params[] = {
+  ISOLATE_PARAMETER,
+  new IdParameter("targetId", true),
+  NULL,
+};
+
+
+static bool GetCallSiteData(Isolate* isolate, JSONStream* js) {
+  return GetHitsOrSites(isolate, js, true);
+}
+
+
 static const MethodParameter* add_breakpoint_params[] = {
   ISOLATE_PARAMETER,
   new IdParameter("scriptId", true),
   new UIntParameter("line", true),
   NULL,
 };
 
 
 static bool AddBreakpoint(Isolate* isolate, JSONStream* js) {
   const char* line_param = js->LookupParam("line");
@@ skipping 818 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart