Display call site data for functions.

runtime/vm/object.cc

 // Copyright (c) 2012, 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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 6840 matching lines @@
   ZoneGrowableArray<const ICData*>* ic_data_array =
       new ZoneGrowableArray<const ICData*>();
   RestoreICDataMap(ic_data_array);
   const Code& code = Code::Handle(unoptimized_code());
   const PcDescriptors& descriptors = PcDescriptors::Handle(
       code.pc_descriptors());
 
   const intptr_t begin_pos = token_pos();
   const intptr_t end_pos = end_token_pos();
 
-  const Script& script = Script::Handle(this->script());
   const GrowableObjectArray& result =
       GrowableObjectArray::Handle(GrowableObjectArray::New());
 
   PcDescriptors::Iterator iter(descriptors,
       RawPcDescriptors::kIcCall | RawPcDescriptors::kUnoptStaticCall);
   while (iter.MoveNext()) {
     const ICData* ic_data = (*ic_data_array)[iter.DeoptId()];
     if (!ic_data->IsNull()) {
       const intptr_t token_pos = iter.TokenPos();
       // Filter out descriptors that do not map to tokens in the source code.
       if ((token_pos < begin_pos) || (token_pos > end_pos)) {
         continue;
       }
 
-      intptr_t line = -1;
-      intptr_t column = -1;
-      script.GetTokenLocation(token_pos, &line, &column);
-
       result.Add(*ic_data);
-      result.Add(Smi::Handle(Smi::New(line)));
-      result.Add(Smi::Handle(Smi::New(column)));
+      result.Add(Smi::Handle(Smi::New(token_pos)));
     }
   }
 
   return result.raw();
 }
 
 
 void ClosureData::set_context_scope(const ContextScope& value) const {
   StorePointer(&raw_ptr()->context_scope_, value.raw());
 }
@@ skipping 5003 matching lines @@
   return result.raw();
 }
 
 
 void ICData::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Object::PrintJSONImpl(stream, ref);
 }
 
 
 void ICData::PrintToJSONArray(JSONArray* jsarray,
-                              intptr_t line,
-                              intptr_t column) const {
+                              intptr_t token_pos) const {
   Isolate* isolate = Isolate::Current();
   Class& cls = Class::Handle();
+  Function& func = Function::Handle();
 
   JSONObject jsobj(jsarray);
   jsobj.AddProperty("name", String::Handle(target_name()).ToCString());
-  jsobj.AddProperty("line", line);
-  jsobj.AddProperty("column", column);
+  jsobj.AddProperty("tokenPos", token_pos);
   // TODO(rmacnak): Figure out how to stringify DeoptReasons().
   // jsobj.AddProperty("deoptReasons", ...);
 
   JSONArray cache_entries(&jsobj, "cacheEntries");
   for (intptr_t i = 0; i < NumberOfChecks(); i++) {
-    intptr_t cid = GetReceiverClassIdAt(i);
-    cls ^= isolate->class_table()->At(cid);
+    func = GetTargetAt(i);
+    if (func.is_static() || (func.kind() == RawFunction::kConstructor)) {
+      cls ^= func.Owner();
+    } else {
+      intptr_t cid = GetReceiverClassIdAt(i);
+      cls ^= isolate->class_table()->At(cid);
+    }
     intptr_t count = GetCountAt(i);
     JSONObject cache_entry(&cache_entries);
-    cache_entry.AddProperty("receiverClass", cls);
+    if (cls.IsTopLevel()) {
+      cache_entry.AddProperty("receiverContainer",
+                              Library::Handle(cls.library()));
+    } else {
+      cache_entry.AddProperty("receiverContainer", cls);
+    }
     cache_entry.AddProperty("count", count);
   }
 }
 
 
 static Token::Kind RecognizeArithmeticOp(const String& name) {
   ASSERT(name.IsSymbol());
   if (name.raw() == Symbols::Plus().raw()) {
     return Token::kADD;
   } else if (name.raw() == Symbols::Minus().raw()) {
@@ skipping 8813 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart