mozilla-central: changeset 343216:002e9c45f121f951f205cc3d3ec7fb563f5a831c

author	Nicholas Nethercote <nnethercote@mozilla.com>
	Wed, 15 Feb 2017 16:24:37 +1100
changeset 343216	002e9c45f121f951f205cc3d3ec7fb563f5a831c
parent 343215	b735a190b14f0a5ea0f0ccb0793624dd89291055
child 343217	6205142186156da59305508759cd08982e38ae1b
push id	31372
push user	cbook@mozilla.com
push date	Thu, 16 Feb 2017 12:16:10 +0000
treeherder	mozilla-central@2737f66ad6ac [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mstange
bugs	1339695, 1317771
milestone	54.0a1
first release with	nightly linux32 6cefe01ca774 / 54.0a1 / 20170217110156 / files nightly linux64 6cefe01ca774 / 54.0a1 / 20170217110156 / files nightly mac 6cefe01ca774 / 54.0a1 / 20170217030229 / files nightly win32 6cefe01ca774 / 54.0a1 / 20170217030229 / files nightly win64 6cefe01ca774 / 54.0a1 / 20170217030229 / files
last release without	nightly linux32 0a7831d838f7 / 54.0a1 / 20170215110151 / files nightly linux64 0a7831d838f7 / 54.0a1 / 20170215110151 / files nightly mac 0a7831d838f7 / 54.0a1 / 20170215030342 / files nightly win32 0a7831d838f7 / 54.0a1 / 20170215030342 / files nightly win64 0a7831d838f7 / 54.0a1 / 20170215030342 / files

--- a/tools/profiler/core/ProfileEntry.h
+++ b/tools/profiler/core/ProfileEntry.h
@@ -304,21 +304,17 @@ private:
   // To avoid incurring JitcodeGlobalTable lookup costs for every JIT frame,
   // we cache the depth of frames keyed by JIT code address. If an address a
   // maps to a depth d, then frames keyed by a for depths 0 to d are
   // guaranteed to be in mFrameToIndexMap.
   std::map<void*, uint32_t> mJITFrameDepthMap;
 
   uint32_t mFrameCount;
   SpliceableChunkedJSONWriter mFrameTableWriter;
-#ifdef SPS_STANDALNOE
-  std::map<FrameKey, uint32_t> mFrameToIndexMap;
-#else
   nsDataHashtable<nsGenericHashKey<FrameKey>, uint32_t> mFrameToIndexMap;
-#endif
 
   SpliceableChunkedJSONWriter mStackTableWriter;
 
   nsDataHashtable<nsGenericHashKey<StackKey>, uint32_t> mStackToIndexMap;
 };
 
 //
 // Thread profile JSON Format