Don't botch assert after OOM while constructing object's lazy type, bug 735016. r=luke

This commit is contained in:
Brian Hackett 2012-04-10 12:27:13 -07:00
parent 8f6d99798b
commit 0f2b8a2a2b

View File

@ -2726,13 +2726,13 @@ TypeObject::getFromPrototypes(JSContext *cx, jsid id, TypeSet *types, bool force
return;
}
TypeSet *protoTypes = proto->type()->getProperty(cx, id, false);
TypeSet *protoTypes = proto->getType(cx)->getProperty(cx, id, false);
if (!protoTypes)
return;
protoTypes->addSubset(cx, types);
proto->type()->getFromPrototypes(cx, id, protoTypes);
proto->getType(cx)->getFromPrototypes(cx, id, protoTypes);
}
static inline void