Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-02 15:15:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 762887 - Add an infallible MUnbox after known-object type barrier. r=dvander

Browse Source
This commit is contained in:
Jan de Mooij 2012-06-09 11:09:28 +02:00
parent 73e00c8b3b
commit b66b17ef6a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3681,9 +3681,13 @@ IonBuilder::pushTypeBarrier(MInstruction *ins, types::TypeSet *actual, types::Ty
MInstruction *barrier;
JSValueType type = observed->getKnownTypeTag(cx);
// An unbox instruction isn't enough to capture JSVAL_TYPE_OBJECT.
if (type == JSVAL_TYPE_OBJECT && !observed->hasType(types::Type::AnyObjectType()))
// An unbox instruction isn't enough to capture JSVAL_TYPE_OBJECT. Use a type
// barrier followed by an infallible unbox.
bool isObject = false;
if (type == JSVAL_TYPE_OBJECT && !observed->hasType(types::Type::AnyObjectType())) {
type = JSVAL_TYPE_UNKNOWN;
isObject = true;
}
switch (type) {
case JSVAL_TYPE_UNKNOWN:
@ -3696,6 +3700,10 @@ IonBuilder::pushTypeBarrier(MInstruction *ins, types::TypeSet *actual, types::Ty
return pushConstant(UndefinedValue());
if (type == JSVAL_TYPE_NULL)
return pushConstant(NullValue());
if (isObject) {
barrier = MUnbox::New(barrier, MIRType_Object, MUnbox::Infallible);
current->add(barrier);
}
break;
default:
MUnbox::Mode mode = ins->isEffectful() ? MUnbox::TypeBarrier : MUnbox::TypeGuard;