[INFER] Fix merge botch.
authorBrian Hackett <bhackett1024@gmail.com>
Tue, 02 Aug 2011 14:23:44 -0700
changeset 77405 f7f014c31f452a80bb7d5e457e374558d3099fb5
parent 77404 37894495d77ddee74fdc66bd3fc2e30f55ab6741
child 77406 e1508f49adc40818c2c9f3222c93253904bc79bb
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone8.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
[INFER] Fix merge botch.
js/src/xpconnect/src/xpcjsruntime.cpp
--- a/js/src/xpconnect/src/xpcjsruntime.cpp
+++ b/js/src/xpconnect/src/xpcjsruntime.cpp
@@ -1345,18 +1345,17 @@ CellCallback(JSContext *cx, void *vdata,
              size_t thingSize)
 {
     IterateData *data = static_cast<IterateData *>(vdata);
     CompartmentStats *curr = data->currCompartmentStats;
     if(traceKind == JSTRACE_OBJECT)
     {
         curr->gcHeapObjects += thingSize;
         JSObject *obj = static_cast<JSObject *>(thing);
-        if(obj->hasSlotsArray())
-            curr->objectSlots += obj->numSlots() * sizeof(js::Value);
+        curr->objectSlots += JS_ObjectCountDynamicSlots(obj) * sizeof(js::Value);
     }
     else if(traceKind == JSTRACE_STRING)
     {
         curr->gcHeapStrings += thingSize;
         JSString *str = static_cast<JSString *>(thing);
         curr->stringChars += str->charsHeapSize();
     }
     else if(traceKind == JSTRACE_SHAPE)