Make the segfault handler attempt to symbolize Dart frames.

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 312 matching lines @@
 ClearProfileVisitor::ClearProfileVisitor(Isolate* isolate)
     : SampleVisitor(isolate) {}
 
 
 void ClearProfileVisitor::VisitSample(Sample* sample) {
   sample->Clear();
 }
 
 
 static void DumpStackFrame(intptr_t frame_index, uword pc) {
+  Isolate* isolate = Isolate::Current();
+  if ((isolate != NULL) && isolate->is_runnable()) {
+    Code& code = Code::Handle(Code::LookupCodeInVmIsolate(pc));
+    if (!code.IsNull()) {
+      OS::PrintErr("  [0x%" Pp "] %s\n", pc, code.QualifiedName());
+      return;
+    }
+    code = Code::LookupCode(pc);
+    if (!code.IsNull()) {
+      OS::PrintErr("  [0x%" Pp "] %s\n", pc, code.QualifiedName());
+      return;
+    }
+  }
+
   uintptr_t start = 0;
   char* native_symbol_name = NativeSymbolResolver::LookupSymbolName(pc, &start);
   if (native_symbol_name == NULL) {
     OS::PrintErr("  [0x%" Pp "] Unknown symbol\n", pc);
   } else {
     OS::PrintErr("  [0x%" Pp "] %s\n", pc, native_symbol_name);
     NativeSymbolResolver::FreeSymbolName(native_symbol_name);
   }
 }
 
 
-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);
-  }
-}
-
-
 class ProfilerStackWalker : public ValueObject {
  public:
   ProfilerStackWalker(Isolate* isolate,
                       Sample* head_sample,
                       SampleBuffer* sample_buffer)
       : isolate_(isolate),
         sample_(head_sample),
         sample_buffer_(sample_buffer),
         frame_index_(0),
         total_frames_(0) {
     ASSERT(isolate_ != NULL);
     if (sample_ == NULL) {
       ASSERT(sample_buffer_ == NULL);
     } else {
       ASSERT(sample_buffer_ != NULL);
       ASSERT(sample_->head_sample());
     }
   }
 
-  bool Append(uword pc, const Code& code) {
-    if (sample_ == NULL) {
-      DumpStackFrame(frame_index_, pc, code);
-      frame_index_++;
-      total_frames_++;
-      return true;
-    }
-    return Append(pc);
-  }
-
   bool Append(uword pc) {
     if (sample_ == NULL) {
       DumpStackFrame(frame_index_, pc);
       frame_index_++;
       total_frames_++;
       return true;
     }
     if (total_frames_ >= FLAG_max_profile_depth) {
       sample_->set_truncated_trace(true);
       return false;
@@ skipping 1126 matching lines @@
 
 
 ProcessedSampleBuffer::ProcessedSampleBuffer()
     : code_lookup_table_(new CodeLookupTable(Thread::Current())) {
   ASSERT(code_lookup_table_ != NULL);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart