corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1140670 part 3. Add an assertParentIs() for asserting the parent is something specific and use it in various places to eliminate getParent() calls. r=waldo

Browse Source
This commit is contained in:
Boris Zbarsky
2015-03-09 12:52:15 -04:00
parent 2ca18615b2
commit 8697b89d94
11 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jsobj.cpp
View File

@@ -1801,8 +1801,9 @@ js::DeepCloneObjectLiteral(JSContext *cx, HandleNativeObject obj, NewObjectKind
if (!group)
return nullptr;
RootedObject proto(cx, group->proto().toObject());
RootedObject parent(cx, obj->getParent());
clone = NewNativeObjectWithGivenProto(cx, &PlainObject::class_, proto, parent, kind,
obj->assertParentIs(cx->global());
clone = NewNativeObjectWithGivenProto(cx, &PlainObject::class_, proto,
NullPtr(), kind,
newKind);
}
@@ -1869,8 +1870,8 @@ InitializePropertiesFromCompatibleNativeObject(JSContext *cx,
{
assertSameCompartment(cx, src, dst);
MOZ_ASSERT(src->getClass() == dst->getClass());
MOZ_ASSERT(src->getParent() == dst->getParent());
MOZ_ASSERT(dst->getParent() == cx->global());
src->assertParentIs(cx->global());
dst->assertParentIs(cx->global());
MOZ_ASSERT(src->getProto() == dst->getProto());
MOZ_ASSERT(dst->lastProperty()->getObjectFlags() == 0);
MOZ_ASSERT(!src->getMetadata());
@@ -2415,7 +2416,7 @@ DefineStandardSlot(JSContext *cx, HandleObject obj, JSProtoKey key, JSAtom *atom
static void
SetClassObject(JSObject *obj, JSProtoKey key, JSObject *cobj, JSObject *proto)
{
MOZ_ASSERT(!obj->getParent());
obj->assertParentIs(nullptr);
if (!obj->is<GlobalObject>())
return;
@@ -2426,7 +2427,7 @@ SetClassObject(JSObject *obj, JSProtoKey key, JSObject *cobj, JSObject *proto)
static void
ClearClassObject(JSObject *obj, JSProtoKey key)
{
MOZ_ASSERT(!obj->getParent());
obj->assertParentIs(nullptr);
if (!obj->is<GlobalObject>())
return;