wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out b979f9d59e89 (bug 678687) for intermittent test_jQuery timeout.

Browse Source
This commit is contained in:
Brian Hackett 2011-11-01 14:52:26 -07:00
parent fb8cd1e54f
commit 19d0d9a85e
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/methodjit/Compiler.h
View File

@ -601,12 +601,6 @@ private:
/* Convert fe from a double to integer (per ValueToECMAInt32) in place. */
void truncateDoubleToInt32(FrameEntry *fe, Uses uses);
/*
* Try to convert a double fe to an integer, with no truncation performed,
* or jump to the slow path per uses.
*/
void tryConvertInteger(FrameEntry *fe, Uses uses);
/* Opcode handlers. */
bool jumpAndTrace(Jump j, jsbytecode *target, Jump *slow = NULL, bool *trampoline = NULL);
bool startLoop(jsbytecode *head, Jump entry, jsbytecode *entryTarget);

35
js/src/methodjit/FastOps.cpp
View File

@ -1038,11 +1038,9 @@ IsCacheableSetElem(FrameEntry *obj, FrameEntry *id, FrameEntry *value)
{
if (obj->isNotType(JSVAL_TYPE_OBJECT))
return false;
if (id->isNotType(JSVAL_TYPE_INT32) && id->isNotType(JSVAL_TYPE_DOUBLE))
if (id->isNotType(JSVAL_TYPE_INT32))
return false;
if (id->isConstant()) {
if (id->isNotType(JSVAL_TYPE_INT32))
return false;
if (id->getValue().toInt32() < 0)
return false;
if (id->getValue().toInt32() + 1 < 0) // watch for overflow in hole paths
@ -1435,22 +1433,6 @@ mjit::Compiler::jsop_setelem_typed(int atype)
}
#endif /* JS_METHODJIT_TYPED_ARRAY */
void
mjit::Compiler::tryConvertInteger(FrameEntry *fe, Uses uses)
{
JS_ASSERT(fe->isType(JSVAL_TYPE_DOUBLE));
JumpList isDouble;
FPRegisterID fpreg = frame.tempFPRegForData(fe);
RegisterID reg = frame.allocReg();
masm.branchConvertDoubleToInt32(fpreg, reg, isDouble, Registers::FPConversionTemp);
Jump j = masm.jump();
isDouble.linkTo(masm.label(), &masm);
stubcc.linkExit(masm.jump(), uses);
j.linkTo(masm.label(), &masm);
frame.learnType(fe, JSVAL_TYPE_INT32, reg);
}
bool
mjit::Compiler::jsop_setelem(bool popGuaranteed)
{
@ -1465,9 +1447,6 @@ mjit::Compiler::jsop_setelem(bool popGuaranteed)
frame.forgetMismatchedObject(obj);
if (id->isType(JSVAL_TYPE_DOUBLE))
tryConvertInteger(id, Uses(3));
// If the object is definitely a dense array or a typed array we can generate
// code directly without using an inline cache.
if (cx->typeInferenceEnabled() && id->mightBeType(JSVAL_TYPE_INT32)) {
@ -1652,18 +1631,15 @@ static inline bool
IsCacheableGetElem(FrameEntry *obj, FrameEntry *id)
{
if (id->isTypeKnown() &&
!(id->isType(JSVAL_TYPE_INT32) || id->isType(JSVAL_TYPE_DOUBLE)
!(id->getKnownType() == JSVAL_TYPE_INT32
#if defined JS_POLYIC
|| id->isType(JSVAL_TYPE_STRING)
|| id->getKnownType() == JSVAL_TYPE_STRING
#endif
)) {
return false;
}
if (id->isType(JSVAL_TYPE_DOUBLE) && id->isConstant())
return false;
if (id->isType(JSVAL_TYPE_INT32) && id->isConstant() &&
if (id->isTypeKnown() && id->getKnownType() == JSVAL_TYPE_INT32 && id->isConstant() &&
id->getValue().toInt32() < 0) {
return false;
}
@ -2029,9 +2005,6 @@ mjit::Compiler::jsop_getelem(bool isCall)
return true;
}
if (id->isType(JSVAL_TYPE_DOUBLE))
tryConvertInteger(id, Uses(2));
// If the object is definitely an arguments object, a dense array or a typed array
// we can generate code directly without using an inline cache.
if (cx->typeInferenceEnabled() && id->mightBeType(JSVAL_TYPE_INT32) && !isCall) {