Also attempt to symbolize dart frames in Profiler::DumpStackTrace.

runtime/vm/profiler.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 "platform/address_sanitizer.h"
 #include "platform/memory_sanitizer.h"
 #include "platform/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
@@ skipping 316 matching lines @@
 
 void ClearProfileVisitor::VisitSample(Sample* sample) {
   sample->Clear();
 }
 
 
 static void DumpStackFrame(intptr_t frame_index, uword pc) {
   uintptr_t start = 0;
   char* native_symbol_name =
       NativeSymbolResolver::LookupSymbolName(pc, &start);
-  if (native_symbol_name == NULL) {
-    OS::PrintErr("Frame[%" Pd "] = `unknown symbol` [0x%" Px "]\n",
-                 frame_index, pc);
-  } else {
-    OS::PrintErr("Frame[%" Pd "] = `%s` [0x%" Px "]\n",
-                 frame_index, native_symbol_name, pc);
+  if (native_symbol_name != NULL) {
+    OS::PrintErr("  %" Pp " [native] %s\n", pc, native_symbol_name);
     NativeSymbolResolver::FreeSymbolName(native_symbol_name);
+    return;
   }
+
+  Code& code = Code::Handle(Code::LookupCodeInVmIsolate(pc));
+  if (code.IsNull()) {
+    code = Code::LookupCode(pc);  // In current isolate.
+  }
+  if (code.IsNull()) {
+    OS::PrintErr("  %" Pp " [unknown]\n", pc);
+    return;
+  }
+
+  const Object& owner = Object::Handle(code.owner());
+  if (owner.IsFunction()) {
+    OS::PrintErr("  %" Pp " [dart] %s\n", pc,
+                 Function::Cast(owner).ToFullyQualifiedCString());
+    return;
+  }
+
+  OS::PrintErr("  %" Pp " [stub] %s\n", pc, code.ToCString());
 }
 
 
 static void DumpStackFrame(intptr_t frame_index,
                            uword pc,
                            const Code& code) {
   if (code.IsNull()) {
     DumpStackFrame(frame_index, pc);
-  } else {
-    OS::PrintErr("Frame[%" Pd "] = Dart:`%s` [0x%" Px "]\n",
-                 frame_index, code.ToCString(), pc);
+    return;
   }
+
+  const Object& owner = Object::Handle(code.owner());
+  if (owner.IsFunction()) {
+    OS::PrintErr("  %" Pp " [dart] %s\n", pc,
+                 Function::Cast(owner).ToFullyQualifiedCString());
+    return;
+  }
+
+  OS::PrintErr("  %" Pp " [stub] %s\n", pc, code.ToCString());
 }
 
 
 class ProfilerStackWalker : public ValueObject {
  public:
   ProfilerStackWalker(Isolate* isolate,
                       Sample* head_sample,
                       SampleBuffer* sample_buffer)
     : isolate_(isolate),
       sample_(head_sample),
@@ skipping 1212 matching lines @@
 
 
 ProcessedSampleBuffer::ProcessedSampleBuffer()
     : code_lookup_table_(new CodeLookupTable(Thread::Current())) {
   ASSERT(code_lookup_table_ != NULL);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart