wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 728411 - Move checkShapeConsistency into ObjectImpl. r=bhackett

Browse Source 
--HG--
extra : rebase_source : 92525ff32e1d27c335eb0d2c73a8b54b0d5b8a54
This commit is contained in:
Jeff Walden 2012-02-23 15:45:01 -08:00
parent 5451b477d4
commit 00596da6c2
4 changed files with 79 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsobj.h
View File

@ -412,10 +412,6 @@ struct JSObject : public js::ObjectImpl
friend struct js::GCMarker;
friend class js::NewObjectCache;
#ifdef DEBUG
void checkShapeConsistency();
#endif
/* Make the type object to use for LAZY_TYPE objects. */
void makeLazyType(JSContext *cx);

84
js/src/jsscope.cpp
View File

@ -512,76 +512,6 @@ NormalizeGetterAndSetter(JSContext *cx, JSObject *obj,
return true;
}
#ifdef DEBUG
# define CHECK_SHAPE_CONSISTENCY(obj) obj->checkShapeConsistency()
void
JSObject::checkShapeConsistency()
{
static int throttle = -1;
if (throttle < 0) {
if (const char *var = getenv("JS_CHECK_SHAPE_THROTTLE"))
throttle = atoi(var);
if (throttle < 0)
throttle = 0;
}
if (throttle == 0)
return;
JS_ASSERT(isNative());
Shape *shape = lastProperty();
Shape *prev = NULL;
if (inDictionaryMode()) {
JS_ASSERT(shape->hasTable());
PropertyTable &table = shape->table();
for (uint32_t fslot = table.freelist; fslot != SHAPE_INVALID_SLOT;
fslot = getSlot(fslot).toPrivateUint32()) {
JS_ASSERT(fslot < slotSpan());
}
for (int n = throttle; --n >= 0 && shape->parent; shape = shape->parent) {
JS_ASSERT_IF(shape != lastProperty(), !shape->hasTable());
Shape **spp = table.search(shape->propid(), false);
JS_ASSERT(SHAPE_FETCH(spp) == shape);
}
shape = lastProperty();
for (int n = throttle; --n >= 0 && shape; shape = shape->parent) {
JS_ASSERT_IF(shape->slot() != SHAPE_INVALID_SLOT, shape->slot() < slotSpan());
if (!prev) {
JS_ASSERT(shape == lastProperty());
JS_ASSERT(shape->listp == &shape_);
} else {
JS_ASSERT(shape->listp == &prev->parent);
}
prev = shape;
}
} else {
for (int n = throttle; --n >= 0 && shape->parent; shape = shape->parent) {
if (shape->hasTable()) {
PropertyTable &table = shape->table();
JS_ASSERT(shape->parent);
for (Shape::Range r(shape); !r.empty(); r.popFront()) {
Shape **spp = table.search(r.front().propid(), false);
JS_ASSERT(SHAPE_FETCH(spp) == &r.front());
}
}
if (prev) {
JS_ASSERT(prev->maybeSlot() >= shape->maybeSlot());
shape->kids.checkConsistency(prev);
}
prev = shape;
}
}
}
#else
# define CHECK_SHAPE_CONSISTENCY(obj) ((void)0)
#endif
Shape *
JSObject::addProperty(JSContext *cx, jsid id,
PropertyOp getter, StrictPropertyOp setter,
@ -680,11 +610,11 @@ JSObject::addPropertyInternal(JSContext *cx, jsid id,
shape->parent->handoffTableTo(shape);
}
CHECK_SHAPE_CONSISTENCY(self);
self->checkShapeConsistency();
return shape;
}
CHECK_SHAPE_CONSISTENCY(self);
self->checkShapeConsistency();
return NULL;
}
@ -841,7 +771,7 @@ JSObject::putProperty(JSContext *cx, jsid id,
Shape *newShape = self->getChildProperty(cx, shape->parent, child);
if (!newShape) {
CHECK_SHAPE_CONSISTENCY(self);
self->checkShapeConsistency();
return NULL;
}
@ -860,7 +790,7 @@ JSObject::putProperty(JSContext *cx, jsid id,
JS_ATOMIC_INCREMENT(&cx->runtime->propertyRemovals);
}
CHECK_SHAPE_CONSISTENCY(self);
self->checkShapeConsistency();
return shape;
}
@ -904,7 +834,7 @@ JSObject::changeProperty(JSContext *cx, Shape *shape, unsigned attrs, unsigned m
Shape *newShape = putProperty(cx, shape->propid(), getter, setter, shape->maybeSlot(),
attrs, shape->flags, shape->maybeShortid());
CHECK_SHAPE_CONSISTENCY(this);
checkShapeConsistency();
return newShape;
}
@ -1021,7 +951,7 @@ JSObject::removeProperty(JSContext *cx, jsid id)
self->removeLastProperty(cx);
}
CHECK_SHAPE_CONSISTENCY(self);
self->checkShapeConsistency();
return true;
}
@ -1043,7 +973,7 @@ JSObject::clear(JSContext *cx)
JS_ALWAYS_TRUE(setLastProperty(cx, shape));
JS_ATOMIC_INCREMENT(&cx->runtime->propertyRemovals);
CHECK_SHAPE_CONSISTENCY(this);
checkShapeConsistency();
}
void

66
js/src/vm/ObjectImpl.cpp
View File

@ -25,6 +25,72 @@ static ObjectElements emptyElementsHeader(0, 0);
HeapSlot *js::emptyObjectElements =
reinterpret_cast<HeapSlot *>(uintptr_t(&emptyElementsHeader) + sizeof(ObjectElements));
#ifdef DEBUG
void
js::ObjectImpl::checkShapeConsistency()
{
static int throttle = -1;
if (throttle < 0) {
if (const char *var = getenv("JS_CHECK_SHAPE_THROTTLE"))
throttle = atoi(var);
if (throttle < 0)
throttle = 0;
}
if (throttle == 0)
return;
MOZ_ASSERT(isNative());
Shape *shape = lastProperty();
Shape *prev = NULL;
if (inDictionaryMode()) {
MOZ_ASSERT(shape->hasTable());
PropertyTable &table = shape->table();
for (uint32_t fslot = table.freelist; fslot != SHAPE_INVALID_SLOT;
fslot = getSlot(fslot).toPrivateUint32()) {
MOZ_ASSERT(fslot < slotSpan());
}
for (int n = throttle; --n >= 0 && shape->parent; shape = shape->parent) {
MOZ_ASSERT_IF(shape != lastProperty(), !shape->hasTable());
Shape **spp = table.search(shape->propid(), false);
MOZ_ASSERT(SHAPE_FETCH(spp) == shape);
}
shape = lastProperty();
for (int n = throttle; --n >= 0 && shape; shape = shape->parent) {
MOZ_ASSERT_IF(shape->slot() != SHAPE_INVALID_SLOT, shape->slot() < slotSpan());
if (!prev) {
MOZ_ASSERT(shape == lastProperty());
MOZ_ASSERT(shape->listp == &shape_);
} else {
MOZ_ASSERT(shape->listp == &prev->parent);
}
prev = shape;
}
} else {
for (int n = throttle; --n >= 0 && shape->parent; shape = shape->parent) {
if (shape->hasTable()) {
PropertyTable &table = shape->table();
MOZ_ASSERT(shape->parent);
for (Shape::Range r(shape); !r.empty(); r.popFront()) {
Shape **spp = table.search(r.front().propid(), false);
MOZ_ASSERT(SHAPE_FETCH(spp) == &r.front());
}
}
if (prev) {
MOZ_ASSERT(prev->maybeSlot() >= shape->maybeSlot());
shape->kids.checkConsistency(prev);
}
prev = shape;
}
}
}
#endif
void
js::ObjectImpl::initSlotRange(size_t start, const Value *vector, size_t length)
{

6
js/src/vm/ObjectImpl.h
View File

@ -155,6 +155,12 @@ class ObjectImpl : public gc::Cell
HeapSlot *slots; /* Slots for object properties. */
HeapSlot *elements; /* Slots for object elements. */
#ifdef DEBUG
void checkShapeConsistency();
#else
void checkShapeConsistency() { }
#endif
private:
static void staticAsserts() {
MOZ_STATIC_ASSERT(sizeof(ObjectImpl) == sizeof(shadow::Object),