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

Merge TM -> JM

Browse Source
This commit is contained in:
Brian Hackett
2010-11-30 09:04:25 -08:00
parent d6c6690f78 190566d869
commit 0f6b40ab0a
1578 changed files with 37198 additions and 18488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsarray.cpp
View File

@@ -539,7 +539,7 @@ DeleteArrayElement(JSContext *cx, JSObject *obj, jsdouble index, JSBool strict)
if (idx < obj->getDenseArrayInitializedLength()) {
obj->setDenseArrayElement(idx, MagicValue(JS_ARRAY_HOLE));
obj->setDenseArrayNotPacked(cx);
return JS_TRUE;
return js_SuppressDeletedIndexProperties(cx, obj, idx, idx+1);
}
}
return JS_TRUE;
@@ -2113,6 +2113,7 @@ js_ArrayCompPush(JSContext *cx, JSObject *obj, const Value &vp)
return ArrayCompPushImpl(cx, obj, vp);
}
#ifdef JS_TRACER
JSBool JS_FASTCALL
js_ArrayCompPush_tn(JSContext *cx, JSObject *obj, ValueArgType v)
{
@@ -2125,6 +2126,7 @@ js_ArrayCompPush_tn(JSContext *cx, JSObject *obj, ValueArgType v)
}
JS_DEFINE_CALLINFO_3(extern, BOOL_FAIL, js_ArrayCompPush_tn, CONTEXT, OBJECT,
VALUE, 0, nanojit::ACCSET_STORE_ANY)
#endif
static JSBool
array_push(JSContext *cx, uintN argc, Value *vp)
@@ -2298,9 +2300,9 @@ array_unshift(JSContext *cx, uintN argc, Value *vp)
return JS_FALSE;
newlen += argc;
if (!js_SetLengthProperty(cx, obj, newlen))
return JS_FALSE;
}
if (!js_SetLengthProperty(cx, obj, newlen))
return JS_FALSE;
/* Follow Perl by returning the new array length. */
vp->setNumber(newlen);