Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-08 12:37:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backing out fix for bug 550351 to fix test failures (CLOSED TREE)

Browse Source
This commit is contained in:
Robert O'Callahan 2010-03-05 21:14:29 +13:00
commit 094e8c60a1
2 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jstracer.cpp
View File

@ -8638,10 +8638,10 @@ TraceRecorder::equalityHelper(jsval l, jsval r, LIns* l_ins, LIns* r_ins,
op = LIR_feq;
}
} else if (JSVAL_IS_NULL(l) && JSVAL_IS_SPECIAL(r)) {
l_ins = INS_VOID();
l_ins = lir->insImm(JSVAL_TO_SPECIAL(JSVAL_VOID));
cond = (r == JSVAL_VOID);
} else if (JSVAL_IS_SPECIAL(l) && JSVAL_IS_NULL(r)) {
r_ins = INS_VOID();
r_ins = lir->insImm(JSVAL_TO_SPECIAL(JSVAL_VOID));
cond = (l == JSVAL_VOID);
} else if (isNumber(l) && JSVAL_IS_STRING(r)) {
args[0] = r_ins, args[1] = cx_ins;
@ -12985,7 +12985,7 @@ TraceRecorder::denseArrayElement(jsval& oval, jsval& ival, jsval*& vp, LIns*& v_
CHECK_STATUS(guardPrototypeHasNoIndexedProperties(obj, obj_ins, MISMATCH_EXIT));
// Return undefined and indicate that we didn't actually read this (addr_ins).
v_ins = INS_VOID();
v_ins = lir->insImm(JSVAL_TO_SPECIAL(JSVAL_VOID));
addr_ins = NULL;
return RECORD_CONTINUE;
}
@ -13057,16 +13057,9 @@ TraceRecorder::typedArrayElement(jsval& oval, jsval& ival, jsval*& vp, LIns*& v_
/* priv_ins will load the TypedArray* */
LIns* priv_ins = stobj_get_const_fslot(obj_ins, JSSLOT_PRIVATE);
/* for out-of-range, do the same thing that the interpreter does, which is return undefined */
if ((jsuint) idx >= tarray->length) {
guard(false,
lir->ins2(LIR_ult,
idx_ins,
lir->insLoad(LIR_ldc, priv_ins, js::TypedArray::lengthOffset())),
BRANCH_EXIT);
v_ins = INS_VOID();
return ARECORD_CONTINUE;
}
/* for out-of-range, just let the interpreter handle it */
if ((jsuint) idx >= tarray->length)
return ARECORD_STOP;
/*
* Ensure idx < length
@ -13081,7 +13074,7 @@ TraceRecorder::typedArrayElement(jsval& oval, jsval& ival, jsval*& vp, LIns*& v_
lir->ins2(LIR_ult,
idx_ins,
lir->insLoad(LIR_ldc, priv_ins, js::TypedArray::lengthOffset())),
BRANCH_EXIT);
OVERFLOW_EXIT);
/* We are now ready to load. Do a different type of load
* depending on what type of thing we're loading. */

22
js/src/trace-test/tests/basic/testTypedArrays.js
View File

@ -1,22 +0,0 @@
function testTypedArrayTrace()
{
var ar = new Uint32Array(16);
for (var i = 0; i < ar.length-1; ++i) {
ar[i+1] = i + ar[i];
}
for (var i = 0; i < ar.length; ++i) {
// deliberate out of bounds access
ar[i-2] = ar[i+2];
}
var t = 0;
for (var i = 0; i < ar.length; ++i) {
t += ar[i];
}
return t;
}
assertEq(testTypedArrayTrace(), 752);