Cleanup native, collected, and stub code handling in profiler

runtime/vm/disassembler_x64.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/disassembler.h"
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_X64)
 #include "platform/utils.h"
 #include "vm/allocation.h"
@@ skipping 784 matching lines @@
   const char* full_class_name = clazz.ToCString();
   const char* format = "instance of %s";
   intptr_t len = OS::SNPrint(NULL, 0, format, full_class_name) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, format, full_class_name);
   return chars;
 }
 
 
 void DisassemblerX64::AppendAddressToBuffer(uint8_t* addr_byte_ptr) {
-  NoGCScope no_gc;
   uword addr = reinterpret_cast<uword>(addr_byte_ptr);
   AppendToBuffer("%#" Px "", addr);
   // Try to print as heap object or stub name
   if (((addr & kSmiTagMask) == kHeapObjectTag) &&
       reinterpret_cast<RawObject*>(addr)->IsOldObject() &&
       !Isolate::Current()->heap()->CodeContains(addr) &&
       Disassembler::CanFindOldObject(addr)) {
+    NoGCScope no_gc;
     const Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr));
     if (obj.IsArray()) {
       const Array& arr = Array::Cast(obj);
       intptr_t len = arr.Length();
       if (len > 5) len = 5;  // Print a max of 5 elements.
       AppendToBuffer("  Array[");
       int i = 0;
       Object& element = Object::Handle();
       while (i < len) {
         element = arr.At(i);
         if (i > 0) AppendToBuffer(", ");
         AppendToBuffer("%s", ObjectToCStringNoGC(element));
         i++;
       }
       if (i < arr.Length()) AppendToBuffer(", ...");
       AppendToBuffer("]");
       return;
     }
     AppendToBuffer("  '%s'", ObjectToCStringNoGC(obj));
   } else {
     // 'addr' is not an object, but probably a code address.
     const char* name_of_stub = StubCode::NameOfStub(addr);
     if (name_of_stub != NULL) {
       AppendToBuffer("  [stub: %s]", name_of_stub);
     } else {
       // Print only if jumping to entry point.
       const Code& code = Code::Handle(Code::LookupCode(addr));
       if (!code.IsNull() && (code.EntryPoint() == addr)) {
-        const Function& function = Function::Handle(code.function());
-        if (function.IsNull()) {
-          AppendToBuffer(" [ stub ]");
-        } else {
-          const char* name_of_function = function.ToFullyQualifiedCString();
-          AppendToBuffer(" [%s]", name_of_function);
-        }
+        const String& name = String::Handle(code.UserName());
+        const char* name_c = name.ToCString();
+        AppendToBuffer(" [%s]", name_c);
       }
     }
   }
 }
 
 
 // Returns number of bytes used, including *data.
 int DisassemblerX64::JumpShort(uint8_t* data) {
   ASSERT(0xEB == *data);
   uint8_t b = *(data + 1);
@@ skipping 1106 matching lines @@
                                   pc);
     pc += instruction_length;
   }
 
   return;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64