Bug 840809 (part 2) - Measure RegExpCompartment::inUse_. r=sstangl.
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 14 Feb 2013 11:11:46 -0800
changeset 131824 e3707e9cbba08791255599831d24c076d7f44c8f
parent 131823 dad25c17ccc75af2fb451eadde6003cd4edfa5f7
child 131825 b9cd1fa2050220540034e8cc5f90e7bcc7c74a78
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssstangl
bugs840809
milestone21.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
Bug 840809 (part 2) - Measure RegExpCompartment::inUse_. r=sstangl.
content/svg/content/src/nsSVGFilters.cpp
js/src/vm/RegExpObject.cpp
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -706,17 +706,20 @@ RegExpCompartment::get(JSContext *cx, Ha
         return false;
 
     return get(cx, atom, flags, g);
 }
 
 size_t
 RegExpCompartment::sizeOfExcludingThis(JSMallocSizeOfFun mallocSizeOf)
 {
-    return map_.sizeOfExcludingThis(mallocSizeOf);
+    size_t n = 0;
+    n += map_.sizeOfExcludingThis(mallocSizeOf);
+    n += inUse_.sizeOfExcludingThis(mallocSizeOf);
+    return n;
 }
 
 /* Functions */
 
 JSObject *
 js::CloneRegExpObject(JSContext *cx, JSObject *obj_, JSObject *proto_)
 {
     RegExpObjectBuilder builder(cx);