author | Nathan Froyd <froydnj@mozilla.com> |
Mon, 30 Nov 2015 13:54:03 -0500 | |
changeset 274770 | 86efea9a2d3068929da0ce935605c60233b7830b |
parent 274769 | 309394a3c84817f68e4c5ef38a162f5aeefed815 |
child 274771 | 97419358e5899b3e6ee2e21e7d89106d90b8fa70 |
push id | 29739 |
push user | cbook@mozilla.com |
push date | Tue, 01 Dec 2015 14:26:30 +0000 |
treeherder | mozilla-central@974fe614d529 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mccr8 |
bugs | 1229099 |
milestone | 45.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/xpcom/base/CycleCollectedJSRuntime.cpp +++ b/xpcom/base/CycleCollectedJSRuntime.cpp @@ -54,16 +54,17 @@ // To improve debugging, if WantAllTraces() is true all JS objects are // traversed. #include "mozilla/CycleCollectedJSRuntime.h" #include <algorithm> #include "mozilla/ArrayUtils.h" #include "mozilla/AutoRestore.h" #include "mozilla/MemoryReporting.h" +#include "mozilla/Snprintf.h" #include "mozilla/Telemetry.h" #include "mozilla/DebuggerOnGCRunnable.h" #include "mozilla/dom/DOMJSClass.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/ScriptSettings.h" #include "jsprf.h" #include "js/Debug.h" #include "nsCycleCollectionNoteRootCallback.h" @@ -514,26 +515,25 @@ CycleCollectedJSRuntime::DescribeGCThing } else if (js::IsFunctionObject(obj)) { JSFunction* fun = JS_GetObjectFunction(obj); JSString* str = JS_GetFunctionDisplayId(fun); if (str) { JSFlatString* flat = JS_ASSERT_STRING_IS_FLAT(str); nsAutoString chars; AssignJSFlatString(chars, flat); NS_ConvertUTF16toUTF8 fname(chars); - JS_snprintf(name, sizeof(name), - "JS Object (Function - %s)", fname.get()); + snprintf_literal(name, "JS Object (Function - %s)", fname.get()); } else { - JS_snprintf(name, sizeof(name), "JS Object (Function)"); + snprintf_literal(name, "JS Object (Function)"); } } else { - JS_snprintf(name, sizeof(name), "JS Object (%s)", clasp->name); + snprintf_literal(name, "JS Object (%s)", clasp->name); } } else { - JS_snprintf(name, sizeof(name), "JS %s", JS::GCTraceKindToAscii(aThing.kind())); + snprintf_literal(name, "JS %s", JS::GCTraceKindToAscii(aThing.kind())); } // Disable printing global for objects while we figure out ObjShrink fallout. aCb.DescribeGCedNode(aIsMarked, name, compartmentAddress); } void CycleCollectedJSRuntime::NoteGCThingJSChildren(JS::GCCellPtr aThing,