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

Bug 780052 - Handle some Double comparisons by coercion. r=jandem

Browse Source
This commit is contained in:
Sean Stangl 2012-08-07 14:23:22 -07:00
parent 16613daef0
commit bbe407f1dd
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
js/src/ion/MIR.cpp
View File

@ -948,26 +948,65 @@ MBinaryArithInstruction::infer(JSContext *cx, const TypeOracle::BinaryTypes &b)
setResultType(rval);
}
static bool
SafelyCoercesToDouble(JSContext *cx, types::TypeSet *types)
{
types::TypeFlags flags = types->baseFlags();
// Strings are unhandled -- visitToDouble() doesn't support them yet.
// Null is unhandled -- ToDouble(null) == 0, but (0 == null) is false.
types::TypeFlags converts = types::TYPE_FLAG_UNDEFINED | types::TYPE_FLAG_DOUBLE |
types::TYPE_FLAG_INT32 | types::TYPE_FLAG_BOOLEAN;
if ((flags & converts) == flags) {
types->addFreeze(cx); // Keeps callsite logic simple.
return true;
}
return false;
}
void
MCompare::infer(JSContext *cx, const TypeOracle::BinaryTypes &b)
{
// Set specialization
if (!b.lhsTypes || !b.rhsTypes)
return;
MIRType lhs = MIRTypeFromValueType(b.lhsTypes->getKnownTypeTag(cx));
MIRType rhs = MIRTypeFromValueType(b.rhsTypes->getKnownTypeTag(cx));
// Strict integer or boolean comparisons may be treated as Int32.
if ((lhs == MIRType_Int32 && rhs == MIRType_Int32) ||
(lhs == MIRType_Boolean && rhs == MIRType_Boolean))
{
specialization_ = MIRType_Int32;
return;
}
// Loose cross-integer/boolean comparisons may be treated as Int32.
if (jsop() != JSOP_STRICTEQ && jsop() != JSOP_STRICTNE &&
(lhs == MIRType_Int32 || lhs == MIRType_Boolean) &&
(rhs == MIRType_Int32 || rhs == MIRType_Boolean))
{
specialization_ = MIRType_Int32;
return;
}
// Numeric comparisons against a double coerce to double.
if (IsNumberType(lhs) && IsNumberType(rhs)) {
specialization_ = MIRType_Double;
return;
}
// Handle double comparisons against something that safely coerces to double.
if (jsop() != JSOP_STRICTEQ && jsop() != JSOP_STRICTNE &&
((lhs == MIRType_Double && SafelyCoercesToDouble(cx, b.rhsTypes)) ||
(rhs == MIRType_Double && SafelyCoercesToDouble(cx, b.lhsTypes))))
{
specialization_ = MIRType_Double;
return;
}
if (jsop() == JSOP_STRICTEQ || jsop() == JSOP_EQ ||
jsop() == JSOP_STRICTNE || jsop() == JSOP_NE)
{