[INFER] Use initialized length instead of capacity in Array.join optimization, bug 655769.

This commit is contained in:
Brian Hackett 2011-05-14 07:39:42 -07:00
parent 0ef82b3c5b
commit 9d91cd346a
2 changed files with 4 additions and 4 deletions

View File

@ -1405,9 +1405,9 @@ array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
StringBuffer sb(cx);
if (!locale && !seplen && obj->isDenseArray() && !js_PrototypeHasIndexedProperties(cx, obj)) {
/* Elements beyond 'capacity' are 'undefined' and thus can be ignored. */
/* Elements beyond the initialized length are 'undefined' and thus can be ignored. */
Value *beg = obj->getDenseArrayElements();
Value *end = beg + Min(length, obj->getDenseArrayCapacity());
Value *end = beg + Min(length, obj->getDenseArrayInitializedLength());
for (Value *vp = beg; vp != end; ++vp) {
if (!JS_CHECK_OPERATION_LIMIT(cx))
return false;

View File

@ -2200,7 +2200,7 @@ mjit::Compiler::generateMethod()
*/
if (cx->typeInferenceEnabled()) {
uint32 slot = ArgSlot(GET_SLOTNO(PC));
if (a->varTypes[slot].type == JSVAL_TYPE_DOUBLE && analysis->trackSlot(slot))
if (analysis->trackSlot(slot) && a->varTypes[slot].type == JSVAL_TYPE_DOUBLE)
frame.ensureDouble(frame.getArg(GET_SLOTNO(PC)));
}
@ -2228,7 +2228,7 @@ mjit::Compiler::generateMethod()
if (cx->typeInferenceEnabled()) {
uint32 slot = LocalSlot(script, GET_SLOTNO(PC));
if (a->varTypes[slot].type == JSVAL_TYPE_DOUBLE && analysis->trackSlot(slot))
if (analysis->trackSlot(slot) && a->varTypes[slot].type == JSVAL_TYPE_DOUBLE)
frame.ensureDouble(frame.getLocal(GET_SLOTNO(PC)));
}