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

Merge.

Browse Source
This commit is contained in:
Andreas Gal
2009-02-09 22:54:41 -08:00
parent 5a3630a33b 91947ce165
commit 289e5bc286
21 changed files with 219 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jsarray.cpp
View File

@@ -2164,7 +2164,7 @@ js_ArrayCompPush(JSContext *cx, JSObject *obj, jsval v)
static jsval FASTCALL
Array_p_push1(JSContext* cx, JSObject* obj, jsval v)
{
if (OBJ_IS_DENSE_ARRAY(cx, obj)
if (OBJ_IS_DENSE_ARRAY(cx, obj)
? array_push1_dense(cx, obj, v, &v)
: array_push_slowly(cx, obj, 1, &v, &v)) {
return v;
@@ -2229,7 +2229,6 @@ array_pop_dense(JSContext *cx, JSObject* obj, jsval *vp)
return JS_FALSE;
obj->fslots[JSSLOT_ARRAY_LENGTH] = index;
return JS_TRUE;
}
#ifdef JS_TRACER
@@ -2255,7 +2254,7 @@ array_pop(JSContext *cx, uintN argc, jsval *vp)
obj = JS_THIS_OBJECT(cx, vp);
if (!obj)
return JS_FALSE;
if (OBJ_IS_DENSE_ARRAY(cx, obj))
if (OBJ_IS_DENSE_ARRAY(cx, obj))
return array_pop_dense(cx, obj, vp);
return array_pop_slowly(cx, obj, vp);
}