From 269fad5982f54672395135f938f6fb6e13f1ad26 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Fri, 29 Nov 2013 16:09:42 +0100
Subject: [PATCH] Bug 819839 - Part 2 - Print file name and line number if
 available in DMD report. r=njn

---
 memory/replace/dmd/DMD.cpp | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/memory/replace/dmd/DMD.cpp b/memory/replace/dmd/DMD.cpp
index 5dbadd1f61e3..665064261bf4 100644
--- a/memory/replace/dmd/DMD.cpp
+++ b/memory/replace/dmd/DMD.cpp
@@ -607,19 +607,23 @@ class LocationService
     const char* mLibrary;   // owned by mLibraryStrings;  never null
                             //   in a non-empty entry is in use
     ptrdiff_t   mLOffset;
+    char*       mFileName;  // owned by the Entry; may be null
+    unsigned long mLineNo;
 
     Entry()
-      : mPc(kUnused), mFunction(nullptr), mLibrary(nullptr), mLOffset(0)
+      : mPc(kUnused), mFunction(nullptr), mLibrary(nullptr), mLOffset(0), mFileName(nullptr), mLineNo(0)
     {}
 
     ~Entry()
     {
       // We don't free mLibrary because it's externally owned.
       InfallibleAllocPolicy::free_(mFunction);
+      InfallibleAllocPolicy::free_(mFileName);
     }
 
-    void Replace(const void* aPc, const char* aFunction, const char* aLibrary,
-                 ptrdiff_t aLOffset)
+    void Replace(const void* aPc, const char* aFunction,
+                 const char* aLibrary, ptrdiff_t aLOffset,
+                 const char* aFileName, unsigned long aLineNo)
     {
       mPc = aPc;
 
@@ -627,14 +631,19 @@ class LocationService
       InfallibleAllocPolicy::free_(mFunction);
       mFunction =
         !aFunction[0] ? nullptr : InfallibleAllocPolicy::strdup_(aFunction);
+      InfallibleAllocPolicy::free_(mFileName);
+      mFileName =
+        !aFileName[0] ? nullptr : InfallibleAllocPolicy::strdup_(aFileName);
+
 
       mLibrary = aLibrary;
       mLOffset = aLOffset;
+      mLineNo = aLineNo;
     }
 
     size_t SizeOfExcludingThis() {
       // Don't measure mLibrary because it's externally owned.
-      return MallocSizeOf(mFunction);
+      return MallocSizeOf(mFunction) + MallocSizeOf(mFileName);
     }
   };
 
@@ -691,7 +700,7 @@ public:
         library = *p;
       }
 
-      entry.Replace(aPc, details.function, library, details.loffset);
+      entry.Replace(aPc, details.function, library, details.loffset, details.filename, details.lineno);
 
     } else {
       mNumCacheHits++;
@@ -699,14 +708,25 @@ public:
 
     MOZ_ASSERT(entry.mPc == aPc);
 
+    uintptr_t entryPc = (uintptr_t)(entry.mPc);
     // Sometimes we get nothing useful.  Just print "???" for the entire entry
     // so that fix-linux-stack.pl doesn't complain about an empty filename.
     if (!entry.mFunction && !entry.mLibrary[0] && entry.mLOffset == 0) {
-      W("   ??? %p\n", entry.mPc);
+      W("   ??? 0x%x\n", entryPc);
     } else {
       // Use "???" for unknown functions.
-      W("   %s[%s +0x%X] %p\n", entry.mFunction ? entry.mFunction : "???",
-        entry.mLibrary, entry.mLOffset, entry.mPc);
+      char* entryFunction = entry.mFunction ? entry.mFunction : "???";
+      if (entry.mFileName) {
+        // On Windows we can get the filename and line number at runtime.
+        W("   %s (%s:%lu) 0x%x\n",
+          entryFunction, entry.mFileName, entry.mLineNo, entryPc);
+      } else {
+        // On Linux and Mac we cannot get the filename and line number at
+        // runtime, so we print the offset in a form that fix-linux-stack.pl and
+        // fix_macosx_stack.py can post-process.
+        W("   %s[%s +0x%X] 0x%x\n",
+          entryFunction, entry.mLibrary, entry.mLOffset, entryPc);
+      }
     }
   }