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 994016: IonMonkey: Improve types at compares with MTypeOf, r=jandem

Browse Source
This commit is contained in:
Hannes Verschore 2015-02-28 01:30:44 +01:00
parent 1165cb46f8
commit b8daacb05c
2 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
js/src/jit/IonBuilder.cpp
View File

@ -3427,13 +3427,88 @@ IonBuilder::detectAndOrStructure(MPhi *ins, bool *branchIsAnd)
bool
IonBuilder::improveTypesAtCompare(MCompare *ins, bool trueBranch, MTest *test)
{
// Only support Compare_Undefined and Compare_Null at the moment.
if (ins->compareType() != MCompare::Compare_Undefined &&
ins->compareType() != MCompare::Compare_Null)
if (ins->compareType() == MCompare::Compare_Undefined ||
ins->compareType() == MCompare::Compare_Null)
{
return true;
return improveTypesAtNullOrUndefinedCompare(ins, trueBranch, test);
}
if ((ins->lhs()->isTypeOf() || ins->rhs()->isTypeOf()) &&
(ins->lhs()->isConstantValue() || ins->rhs()->isConstantValue()))
{
return improveTypesAtTypeOfCompare(ins, trueBranch, test);
}
return true;
}
bool
IonBuilder::improveTypesAtTypeOfCompare(MCompare *ins, bool trueBranch, MTest *test)
{
MTypeOf *typeOf = ins->lhs()->isTypeOf() ? ins->lhs()->toTypeOf() : ins->rhs()->toTypeOf();
const Value *constant =
ins->lhs()->isConstant() ? ins->lhs()->constantVp() : ins->rhs()->constantVp();
if (!constant->isString())
return true;
bool equal = ins->jsop() == JSOP_EQ || ins->jsop() == JSOP_STRICTEQ;
bool notEqual = ins->jsop() == JSOP_NE || ins->jsop() == JSOP_STRICTNE;
if (notEqual)
trueBranch = !trueBranch;
// Relational compares not supported.
if (!equal && !notEqual)
return true;
MDefinition *subject = typeOf->input();
if (!subject->resultTypeSet() || subject->resultTypeSet()->unknown())
return true;
// Note: we cannot remove the AnyObject type in the false branch,
// since there are multiple ways to get an object. That is the reason
// for the 'trueBranch' test.
TemporaryTypeSet filter;
const JSAtomState &names = GetJitContext()->runtime->names();
if (constant->toString() == TypeName(JSTYPE_VOID, names)) {
filter.addType(TypeSet::UndefinedType(), alloc_->lifoAlloc());
if (typeOf->inputMaybeCallableOrEmulatesUndefined() && trueBranch)
filter.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
} else if (constant->toString() == TypeName(JSTYPE_NUMBER, names)) {
filter.addType(TypeSet::Int32Type(), alloc_->lifoAlloc());
filter.addType(TypeSet::DoubleType(), alloc_->lifoAlloc());
} else if (constant->toString() == TypeName(JSTYPE_STRING, names)) {
filter.addType(TypeSet::StringType(), alloc_->lifoAlloc());
} else if (constant->toString() == TypeName(JSTYPE_SYMBOL, names)) {
filter.addType(TypeSet::SymbolType(), alloc_->lifoAlloc());
} else if (constant->toString() == TypeName(JSTYPE_OBJECT, names)) {
filter.addType(TypeSet::NullType(), alloc_->lifoAlloc());
if (trueBranch)
filter.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
} else if (constant->toString() == TypeName(JSTYPE_FUNCTION, names)) {
if (typeOf->inputMaybeCallableOrEmulatesUndefined() && trueBranch)
filter.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
}
TemporaryTypeSet *type;
if (trueBranch)
type = TypeSet::intersectSets(&filter, subject->resultTypeSet(), alloc_->lifoAlloc());
else
type = TypeSet::removeSet(subject->resultTypeSet(), &filter, alloc_->lifoAlloc());
if (!type)
return false;
return replaceTypeSet(subject, type, test);
}
bool
IonBuilder::improveTypesAtNullOrUndefinedCompare(MCompare *ins, bool trueBranch, MTest *test)
{
MOZ_ASSERT(ins->compareType() == MCompare::Compare_Undefined ||
ins->compareType() == MCompare::Compare_Null);
// altersUndefined/Null represents if we can filter/set Undefined/Null.
bool altersUndefined, altersNull;
JSOp op = ins->jsop();

3
js/src/jit/IonBuilder.h
View File

@ -356,6 +356,9 @@ class IonBuilder
// Improve the type information at tests
bool improveTypesAtTest(MDefinition *ins, bool trueBranch, MTest *test);
bool improveTypesAtCompare(MCompare *ins, bool trueBranch, MTest *test);
bool improveTypesAtNullOrUndefinedCompare(MCompare *ins, bool trueBranch, MTest *test);
bool improveTypesAtTypeOfCompare(MCompare *ins, bool trueBranch, MTest *test);
// Used to detect triangular structure at test.
bool detectAndOrStructure(MPhi *ins, bool *branchIsTrue);
bool replaceTypeSet(MDefinition *subject, TemporaryTypeSet *type, MTest *test);