Bug 915687 - Watch for type objects with lazy protos when merging off thread parses, r=billm.

This commit is contained in:
Brian Hackett 2013-09-12 16:21:51 -06:00
parent 9f7af3df42
commit b4cd0d2371

View File

@ -560,11 +560,11 @@ WorkerThreadState::finishParseTask(JSContext *maybecx, JSRuntime *rt, void *toke
iter.next())
{
types::TypeObject *object = iter.get<types::TypeObject>();
JSObject *proto = object->proto;
if (!proto)
TaggedProto proto(object->proto);
if (!proto.isObject())
continue;
JSProtoKey key = js_IdentifyClassPrototype(proto);
JSProtoKey key = js_IdentifyClassPrototype(proto.toObject());
if (key == JSProto_Null)
continue;