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

backout bd072e286fc0 (bug 858617) for assertion failures in check-jit-test

Browse Source
This commit is contained in:
Jonathan Kew 2013-04-08 12:59:04 +01:00
parent 27e78b220a
commit bb2bea552c
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/ion/IonBuilder.cpp
View File

@ -3102,15 +3102,6 @@ IonBuilder::addTypeBarrier(uint32_t i, CallInfo &callinfo, types::StackTypeSet *
if (needsBarrier) { if (needsBarrier) {
MTypeBarrier *barrier = MTypeBarrier::New(ins, cloneTypeSet(calleeObs), Bailout_Normal); MTypeBarrier *barrier = MTypeBarrier::New(ins, cloneTypeSet(calleeObs), Bailout_Normal);
current->add(barrier); current->add(barrier);
// Make sure unknown inputs are always boxed.
if (callerObs->getKnownTypeTag() == JSVAL_TYPE_UNKNOWN &&
ins->type() != MIRType_Value)
{
MBox *box = MBox::New(ins);
current->add(box);
ins = box;
}
} }
if (i == 0) if (i == 0)

2
js/src/jsinfer.cpp
View File

@ -378,7 +378,7 @@ TypeSet::intersectionEmpty(TypeSet *other)
if (unknown() || other->unknown()) if (unknown() || other->unknown())
return false; return false;
if (unknownObject() && other->unknownObject()) if (unknownObject() && unknownObject())
return false; return false;
if (unknownObject() && other->getObjectCount() > 0) if (unknownObject() && other->getObjectCount() > 0)