Bug 1397856 replacing Sprinter with js::GenericPrinter r?nbp,Yoric draft
authorsourav3 <sourav.mukherjee619@gmail.com>
Thu, 14 Sep 2017 02:17:02 +0800
changeset 664079 219537a86d7b4f326ddd83880915e47777f02673
parent 663831 1888ec2f277f6bb26271b8808e08914a21db9efe
child 731373 7a99644702b1f09b11cd92f1aec61c4a7e6a502f
push id79622
push userbmo:sourav.mukherjee619@gmail.com
push dateWed, 13 Sep 2017 18:21:14 +0000
reviewersnbp, Yoric
bugs1397856
milestone57.0a1
Bug 1397856 replacing Sprinter with js::GenericPrinter r?nbp,Yoric MozReview-Commit-ID: FQ89BijH5VV *** Bug 1397856 removing empty line MozReview-Commit-ID: EwJSL3K6ree
js/src/jsobj.cpp
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -3783,21 +3783,16 @@ js::DumpBacktrace(JSContext* cx, FILE* f
 {
     Fprinter out(fp);
     js::DumpBacktrace(cx, out);
 }
 
 JS_FRIEND_API(void)
 js::DumpBacktrace(JSContext* cx, js::GenericPrinter& out)
 {
-    Sprinter sprinter(cx, false);
-    if (!sprinter.init()) {
-        out.put("js::DumpBacktrace: OOM\n");
-        return;
-    }
     size_t depth = 0;
     for (AllFramesIter i(cx); !i.done(); ++i, ++depth) {
         const char* filename;
         unsigned line;
         if (i.hasScript()) {
             filename = JS_GetScriptFilename(i.script());
             line = PCToLineNumber(i.script(), i.pc());
         } else {
@@ -3806,31 +3801,27 @@ js::DumpBacktrace(JSContext* cx, js::Gen
         }
         char frameType =
             i.isInterp() ? 'i' :
             i.isBaseline() ? 'b' :
             i.isIon() ? 'I' :
             i.isWasm() ? 'W' :
             '?';
 
-        sprinter.printf("#%zu %14p %c   %s:%d",
+        out.printf("#%zu %14p %c   %s:%d",
                         depth, i.rawFramePtr(), frameType, filename, line);
 
         if (i.hasScript()) {
-            sprinter.printf(" (%p @ %zu)\n",
+            out.printf(" (%p @ %zu)\n",
                             i.script(), i.script()->pcToOffset(i.pc()));
         } else {
-            sprinter.printf(" (%p)\n", i.pc());
+            out.printf(" (%p)\n", i.pc());
         }
     }
-    out.printf("%s", sprinter.string());
-#ifdef XP_WIN32
-    if (IsDebuggerPresent())
-        OutputDebugStringA(sprinter.string());
-#endif
+
 }
 
 JS_FRIEND_API(void)
 js::DumpBacktrace(JSContext* cx)
 {
     DumpBacktrace(cx, stdout);
 }