Cleanup native, collected, and stub code handling in profiler

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 4510 matching lines @@
 
 bool Function::HasBreakpoint() const {
   return Isolate::Current()->debugger()->HasBreakpoint(*this);
 }
 
 
 void Function::SetCode(const Code& value) const {
   StorePointer(&raw_ptr()->code_, value.raw());
   ASSERT(Function::Handle(value.function()).IsNull() ||
     (value.function() == this->raw()));
-  value.set_function(*this);
+  value.set_owner_function(*this);

[Ivan Posva, 2014/02/28 21:46:35]

I still think this should be called set_owner.

[Cutch, 2014/02/28 22:47:05]

Done.

 }
 
 
 void Function::SwitchToUnoptimizedCode() const {
   ASSERT(HasOptimizedCode());
 
   const Code& current_code = Code::Handle(CurrentCode());
 
   // Optimized code object might have been actually fully produced by the
   // intrinsifier in this case nothing has to be done. In fact an attempt to
@@ skipping 5709 matching lines @@
   }
 }
 
 
 // Check if object matches find condition.
 bool Code::FindRawCodeVisitor::FindObject(RawObject* obj) const {
   return RawInstructions::ContainsPC(obj, pc_);
 }
 
 
-RawCode* Code::LookupCode(uword pc) {
-  Isolate* isolate = Isolate::Current();
+RawCode* Code::LookupCodeInIsolate(Isolate* isolate, uword pc) {
+  ASSERT((isolate == Isolate::Current()) || (isolate == Dart::vm_isolate()));
   NoGCScope no_gc;
   FindRawCodeVisitor visitor(pc);
   RawInstructions* instr;
   if (isolate->heap() == NULL) {
     return Code::null();
   }
   instr = isolate->heap()->FindObjectInCodeSpace(&visitor);
   if (instr != Instructions::null()) {
     return instr->ptr()->code_;
   }
   return Code::null();
 }
 
 
+RawCode* Code::LookupCode(uword pc) {
+  return LookupCodeInIsolate(Isolate::Current(), pc);
+}
+
+
+RawCode* Code::LookupCodeInVmIsolate(uword pc) {
+  return LookupCodeInIsolate(Dart::vm_isolate(), pc);
+}
+
+
 intptr_t Code::GetTokenIndexOfPC(uword pc) const {
   intptr_t token_pos = -1;
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     if (descriptors.PC(i) == pc) {
       token_pos = descriptors.TokenPos(i);
       break;
     }
   }
   return token_pos;
@@ skipping 28 matching lines @@
 
 const char* Code::ToCString() const {
   const char* kFormat = "Code entry:%p";
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, EntryPoint()) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, EntryPoint());
   return chars;
 }
 
 
+RawString* Code::Name() const {

[Ivan Posva, 2014/02/28 21:46:35]

If we stored the Class object instead of the cid as part of the owner field,
then we could just dispatch on the obejct's type here.

[Cutch, 2014/02/28 22:47:05]

Done.

+  if (OwnerIsStub()) {
+    // Regular stub.
+    const char* name = StubCode::NameOfStub(EntryPoint());
+    ASSERT(name != NULL);
+    return String::New(name);
+  } else if (OwnerIsAllocationStub()) {
+    // Allocation stub.
+    Isolate* isolate = Isolate::Current();
+    ClassTable* class_table = isolate->class_table();
+    intptr_t cid = Smi::Value(allocation_stub_class_id());
+    Class& cls = Class::Handle();
+    cls ^= class_table->At(cid);
+    ASSERT(!cls.IsNull());
+    String& cls_name = String::Handle(cls.Name());
+    ASSERT(!cls_name.IsNull());
+    return String::Concat(Symbols::AllocationStubFor(), cls_name);
+  } else {
+    ASSERT(OwnerIsFunction());
+    // Dart function.
+    Function& func = Function::Handle();
+    func ^= function();
+    ASSERT(!func.IsNull());
+    return func.name();
+  }
+}
+
+
+RawString* Code::UserName() const {
+  if (OwnerIsStub()) {
+    // Regular stub.
+    const char* name = StubCode::NameOfStub(EntryPoint());
+    ASSERT(name != NULL);
+    return String::New(name);
+  } else if (OwnerIsAllocationStub()) {
+    // Allocation stub.
+    Isolate* isolate = Isolate::Current();
+    ClassTable* class_table = isolate->class_table();
+    intptr_t cid = Smi::Value(allocation_stub_class_id());
+    Class& cls = Class::Handle();
+    cls ^= class_table->At(cid);
+    ASSERT(!cls.IsNull());
+    String& cls_name = String::Handle(cls.UserVisibleName());
+    ASSERT(!cls_name.IsNull());
+    return String::Concat(Symbols::AllocationStubFor(), cls_name);
+  } else {
+    ASSERT(OwnerIsFunction());
+    // Dart function.
+    Function& func = Function::Handle();
+    func ^= function();
+    ASSERT(!func.IsNull());
+    return func.QualifiedUserVisibleName();
+  }
+}
+
 void Code::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddPropertyF("id", "code/%" Px "", EntryPoint());
   jsobj.AddPropertyF("start", "%" Px "", EntryPoint());
   jsobj.AddPropertyF("end", "%" Px "", EntryPoint() + Size());
-  Function& func = Function::Handle();
-  func ^= function();
-  ASSERT(!func.IsNull());
-  String& name = String::Handle();
-  ASSERT(!func.IsNull());
-  name ^= func.name();
-  const char* internal_function_name = name.ToCString();
-  jsobj.AddPropertyF("name", "%s%s", is_optimized() ? "*" : "",
-                                     internal_function_name);
-  name ^= func.QualifiedUserVisibleName();
-  const char* function_name = name.ToCString();
-  jsobj.AddPropertyF("user_name", "%s%s", is_optimized() ? "*" : "",
-                                          function_name);
+  jsobj.AddProperty("is_optimized", is_optimized());
+  jsobj.AddProperty("is_alive", is_alive());
+  const String& name = String::Handle(Name());
+  const String& user_name = String::Handle(UserName());
+  const char* name_prefix = is_optimized() ? "*" : "";
+  jsobj.AddPropertyF("name", "%s%s", name_prefix, name.ToCString());
+  jsobj.AddPropertyF("user_name", "%s%s", name_prefix, user_name.ToCString());
   if (ref) {
     return;
   }
-  jsobj.AddProperty("is_optimized", is_optimized());
-  jsobj.AddProperty("is_alive", is_alive());
-  jsobj.AddProperty("function", Object::Handle(function()));
   JSONArray jsarr(&jsobj, "disassembly");
   if (is_alive()) {
     // Only disassemble alive code objects.
     DisassembleToJSONStream formatter(jsarr);
     Disassemble(&formatter);
   }
 }
 
 
 uword Code::GetPatchCodePc() const {
@@ skipping 7066 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart