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

Bug 973238 Part 6 -- Consult prototype rather than typed object addendum r=bhackett

Browse Source
This commit is contained in:
Nicholas D. Matsakis 2014-03-11 13:23:24 -04:00
parent 9b26e43519
commit 45e8e43a64
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 973238 part 5 needs clobber due to self-hosted code (bug 1019955).
Bug 973238 part 6 needs clobber due to self-hosted code (bug 1019955).

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

@ -10264,14 +10264,20 @@ IonBuilder::typeSetToTypeDescrSet(types::TemporaryTypeSet *types,
TypeDescrSetBuilder set;
for (uint32_t i = 0; i < types->getObjectCount(); i++) {
types::TypeObject *type = types->getTypeObject(i);
if (!type || type->unknownProperties())
if (!type)
return true;
if (!type->hasTypedObject())
if (!IsTypedObjectClass(type->clasp()))
return true;
TypeDescr &descr = type->typedObject()->descr();
if (!set.insert(&descr))
TaggedProto proto = type->proto();
// typed objects have immutable prototypes, and they are
// always instances of TypedProto
JS_ASSERT(proto.isObject() && proto.toObject()->is<TypedProto>());
TypedProto &typedProto = proto.toObject()->as<TypedProto>();
if (!set.insert(&typedProto.typeDescr()))
return false;
}