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

runtime/vm/coverage.cc

Index: runtime/vm/coverage.cc
diff --git a/runtime/vm/coverage.cc b/runtime/vm/coverage.cc
index 69eadcaeca176ff4952992316d577a84b486c0a3..2450209f341bf26dd23d3af9d8845e5238c633e7 100644
--- a/runtime/vm/coverage.cc
+++ b/runtime/vm/coverage.cc
@@ -53,8 +53,9 @@ static void ComputeTokenPosToLineNumberMap(const Script& script,
 
 
 void CodeCoverage::CompileAndAdd(const Function& function,
-                                 const JSONArray& hits_arr,
-                                 const GrowableArray<intptr_t>& pos_to_line) {
+                                 const JSONArray& hits_or_sites,
+                                 const GrowableArray<intptr_t>& pos_to_line,
+                                 bool as_call_sites) {
   Isolate* isolate = Isolate::Current();
   if (!function.HasCode()) {
     // If the function should not be compiled or if the compilation failed,
@@ -113,19 +114,23 @@ void CodeCoverage::CompileAndAdd(const Function& function,
       if (last_line == line) {
         last_count += ic_data->AggregateCount();
       } else {
-        if (last_line != -1) {
-          hits_arr.AddValue(last_line);
-          hits_arr.AddValue(last_count);
+        if ((last_line != -1) && !as_call_sites) {
+          hits_or_sites.AddValue(last_line);
+          hits_or_sites.AddValue(last_count);
         }
         last_count = ic_data->AggregateCount();
         last_line = line;
       }
+      if (as_call_sites) {
+        bool is_static_call = iter.Kind() == RawPcDescriptors::kUnoptStaticCall;
+        ic_data->PrintToJSONArray(hits_or_sites, token_pos, is_static_call);
+      }
     }
   }
   // Write last hit value if needed.
-  if (last_line != -1) {
-    hits_arr.AddValue(last_line);
-    hits_arr.AddValue(last_count);
+  if ((last_line != -1) && !as_call_sites) {
+    hits_or_sites.AddValue(last_line);
+    hits_or_sites.AddValue(last_count);
   }
 }
 
@@ -133,7 +138,8 @@ void CodeCoverage::CompileAndAdd(const Function& function,
 void CodeCoverage::PrintClass(const Library& lib,
                               const Class& cls,
                               const JSONArray& jsarr,
-                              CoverageFilter* filter) {
+                              CoverageFilter* filter,
+                              bool as_call_sites) {
   Isolate* isolate = Isolate::Current();
   if (cls.EnsureIsFinalized(isolate) != Error::null()) {
     // Only classes that have been finalized do have a meaningful list of
@@ -161,7 +167,7 @@ void CodeCoverage::PrintClass(const Library& lib,
     JSONObject jsobj(&jsarr);
     jsobj.AddProperty("source", saved_url.ToCString());
     jsobj.AddProperty("script", script);
-    JSONArray hits_arr(&jsobj, "hits");
+    JSONArray hits_or_sites(&jsobj, as_call_sites ? "callSites" : "hits");
 
     // We stay within this loop while we are seeing functions from the same
     // source URI.
@@ -177,10 +183,10 @@ void CodeCoverage::PrintClass(const Library& lib,
         i++;
         continue;
       }
-      CompileAndAdd(function, hits_arr, pos_to_line);
+      CompileAndAdd(function, hits_or_sites, pos_to_line, as_call_sites);
       if (function.HasImplicitClosureFunction()) {
         function = function.ImplicitClosureFunction();
-        CompileAndAdd(function, hits_arr, pos_to_line);
+        CompileAndAdd(function, hits_or_sites, pos_to_line, as_call_sites);
       }
       i++;
     }
@@ -206,7 +212,7 @@ void CodeCoverage::PrintClass(const Library& lib,
       JSONObject jsobj(&jsarr);
       jsobj.AddProperty("source", saved_url.ToCString());
       jsobj.AddProperty("script", script);
-      JSONArray hits_arr(&jsobj, "hits");
+      JSONArray hits_or_sites(&jsobj, as_call_sites ? "callSites" : "hits");
 
       // We stay within this loop while we are seeing functions from the same
       // source URI.
@@ -218,7 +224,7 @@ void CodeCoverage::PrintClass(const Library& lib,
           pos_to_line.Clear();
           break;
         }
-        CompileAndAdd(function, hits_arr, pos_to_line);
+        CompileAndAdd(function, hits_or_sites, pos_to_line, as_call_sites);
         i++;
       }
     }
@@ -239,7 +245,7 @@ void CodeCoverage::Write(Isolate* isolate) {
   }
 
   JSONStream stream;
-  PrintJSON(isolate, &stream, NULL);
+  PrintJSON(isolate, &stream, NULL, false);
 
   const char* format = "%s/dart-cov-%" Pd "-%" Pd ".json";
   intptr_t pid = OS::ProcessId();
@@ -260,7 +266,8 @@ void CodeCoverage::Write(Isolate* isolate) {
 
 void CodeCoverage::PrintJSON(Isolate* isolate,
                              JSONStream* stream,
-                             CoverageFilter* filter) {
+                             CoverageFilter* filter,
+                             bool as_call_sites) {
   CoverageFilterAll default_filter;
   if (filter == NULL) {
     filter = &default_filter;
@@ -279,7 +286,7 @@ void CodeCoverage::PrintJSON(Isolate* isolate,
       while (it.HasNext()) {
         cls = it.GetNextClass();
         ASSERT(!cls.IsNull());
-        PrintClass(lib, cls, jsarr, filter);
+        PrintClass(lib, cls, jsarr, filter, as_call_sites);
       }
     }
   }