corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 519363 debugging followup: strip diagnostic instrumentation, r=lw

Browse Source
This commit is contained in:
David Mandelin
2009-11-09 16:57:47 -08:00
parent 8ccbd39885
commit d915d11728
10 changed files with 30 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/jsarray.cpp
View File

@@ -315,9 +315,9 @@ ResizeSlots(JSContext *cx, JSObject *obj, uint32 oldlen, uint32 newlen,
jsval *slots, *newslots;
if (newlen == 0) {
if (DSLOTS_IS_NOT_NULL(obj)) {
if (obj->dslots) {
cx->free(obj->dslots - 1);
obj->dslots = DSLOTS_NULL_RESIZE_SLOTS;
obj->dslots = NULL;
}
return JS_TRUE;
}
@@ -327,7 +327,7 @@ ResizeSlots(JSContext *cx, JSObject *obj, uint32 oldlen, uint32 newlen,
return JS_FALSE;
}
slots = DSLOTS_IS_NOT_NULL(obj) ? obj->dslots - 1 : NULL;
slots = obj->dslots ? obj->dslots - 1 : NULL;
newslots = (jsval *) cx->realloc(slots, (size_t(newlen) + 1) * sizeof(jsval));
if (!newslots)
return JS_FALSE;
@@ -1210,9 +1210,9 @@ slowarray_enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
static void
array_finalize(JSContext *cx, JSObject *obj)
{
if (DSLOTS_IS_NOT_NULL(obj))
if (obj->dslots)
cx->free(obj->dslots - 1);
obj->dslots = DSLOTS_NULL_ARRAY_FINALIZE;
obj->dslots = NULL;
}
static void
@@ -1826,7 +1826,7 @@ array_reverse(JSContext *cx, uintN argc, jsval *vp)
if (OBJ_IS_DENSE_ARRAY(cx, obj) && !js_PrototypeHasIndexedProperties(cx, obj)) {
/* An empty array or an array with no elements is already reversed. */
if (len == 0 || !DSLOTS_IS_NOT_NULL(obj))
if (len == 0 || !obj->dslots)
return JS_TRUE;
/*
@@ -2553,7 +2553,7 @@ array_shift(JSContext *cx, uintN argc, jsval *vp)
if (OBJ_IS_DENSE_ARRAY(cx, obj) && !js_PrototypeHasIndexedProperties(cx, obj) &&
length < js_DenseArrayCapacity(obj)) {
if (JS_LIKELY(DSLOTS_IS_NOT_NULL(obj))) {
if (JS_LIKELY(obj->dslots != NULL)) {
*vp = obj->dslots[0];
if (*vp == JSVAL_HOLE)
*vp = JSVAL_VOID;
@@ -3420,7 +3420,7 @@ js_NewEmptyArray(JSContext* cx, JSObject* proto)
obj->fslots[JSSLOT_ARRAY_COUNT] = 0;
for (unsigned i = JSSLOT_ARRAY_COUNT + 1; i != JS_INITIAL_NSLOTS; ++i)
obj->fslots[i] = JSVAL_VOID;
obj->dslots = DSLOTS_NULL_NEW_EMPTY_ARRAY;
obj->dslots = NULL;
return obj;
}
#ifdef JS_TRACER