зеркало из https://github.com/mozilla/pjs.git
Compilation fix for 489899.
This commit is contained in:
Родитель
d376befe98
Коммит
44e2379922
|
@ -901,7 +901,7 @@ js_Array_dense_setelem(JSContext* cx, JSObject* obj, jsint i, jsval v)
|
|||
* Let the interpreter worry about negative array indexes.
|
||||
*/
|
||||
JS_ASSERT((MAX_DSLOTS_LENGTH > JSVAL_INT_MAX) == (sizeof(jsval) != sizeof(uint32)));
|
||||
if (MAX_DSLOTS_SIZE > JSVAL_INT_MAX) {
|
||||
if (MAX_DSLOTS_LENGTH > JSVAL_INT_MAX) {
|
||||
/*
|
||||
* Have to check for negative values bleeding through on 64-bit machines only,
|
||||
* since we can't allocate large enough arrays for this on 32-bit machines.
|
||||
|
|
|
@ -8477,7 +8477,7 @@ TraceRecorder::elem(jsval& oval, jsval& ival, jsval*& vp, LIns*& v_ins, LIns*& a
|
|||
if (!within) {
|
||||
/* If idx < 0, stay on trace (and read value as undefined, since this is a dense array). */
|
||||
LIns* br1 = NULL;
|
||||
if (MAX_DSLOTS_SIZE > JS_BITMASK(30) && !idx_ins->isconst()) {
|
||||
if (MAX_DSLOTS_LENGTH > JS_BITMASK(30) && !idx_ins->isconst()) {
|
||||
JS_ASSERT(sizeof(jsval) == 8); // Only 64-bit machines support large enough arrays for this.
|
||||
br1 = lir->insBranch(LIR_jt,
|
||||
lir->ins2i(LIR_lt, idx_ins, 0),
|
||||
|
@ -8520,7 +8520,7 @@ TraceRecorder::elem(jsval& oval, jsval& ival, jsval*& vp, LIns*& v_ins, LIns*& a
|
|||
}
|
||||
|
||||
/* Guard against negative index */
|
||||
if (MAX_DSLOTS_SIZE > JS_BITMASK(30) && !idx_ins->isconst()) {
|
||||
if (MAX_DSLOTS_LENGTH > JS_BITMASK(30) && !idx_ins->isconst()) {
|
||||
JS_ASSERT(sizeof(jsval) == 8); // Only 64-bit machines support large enough arrays for this.
|
||||
guard(false,
|
||||
lir->ins2i(LIR_lt, idx_ins, 0),
|
||||
|
|
Загрузка…
Ссылка в новой задаче