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

[INFER] Spot fix for shapes not being marked when a child is held by AutoShapeRooter, bug 642209.

Browse Source
This commit is contained in:
Brian Hackett 2011-03-16 18:24:20 -07:00
parent 293ec73b3d
commit f5e8d2edbd
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsapi.cpp
View File

@ -4103,7 +4103,7 @@ prop_iter_trace(JSTracer *trc, JSObject *obj)
if (obj->getSlot(JSSLOT_ITER_INDEX).toInt32() < 0) { if (obj->getSlot(JSSLOT_ITER_INDEX).toInt32() < 0) {
/* Native case: just mark the next property to visit. */ /* Native case: just mark the next property to visit. */
((Shape *) pdata)->trace(trc); Shape::trace(trc, (Shape *) pdata);
} else { } else {
/* Non-native case: mark each id in the JSIdArray private. */ /* Non-native case: mark each id in the JSIdArray private. */
JSIdArray *ida = (JSIdArray *) pdata; JSIdArray *ida = (JSIdArray *) pdata;

2
js/src/jsdbgapi.cpp
View File

@ -651,7 +651,7 @@ js_TraceWatchPoints(JSTracer *trc)
if (wp->object->isMarked()) { if (wp->object->isMarked()) {
if (!wp->shape->marked()) { if (!wp->shape->marked()) {
modified = true; modified = true;
wp->shape->trace(trc); Shape::trace(trc, wp->shape);
} }
if (wp->shape->hasSetterValue() && wp->setter) { if (wp->shape->hasSetterValue() && wp->setter) {
if (!CastAsObject(wp->setter)->isMarked()) { if (!CastAsObject(wp->setter)->isMarked()) {

2
js/src/jsgc.cpp
View File

@ -1517,7 +1517,7 @@ AutoGCRooter::trace(JSTracer *trc)
return; return;
case SHAPE: case SHAPE:
static_cast<AutoShapeRooter *>(this)->shape->trace(trc); Shape::trace(trc, static_cast<AutoShapeRooter *>(this)->shape);
return; return;
case PARSER: case PARSER:

2
js/src/jsgcinlines.h
View File

@ -641,7 +641,7 @@ MarkShapeRange(JSTracer *trc, const Shape **beg, const Shape **end, const char *
{ {
for (const Shape **sp = beg; sp < end; ++sp) { for (const Shape **sp = beg; sp < end; ++sp) {
JS_SET_TRACING_INDEX(trc, name, sp - beg); JS_SET_TRACING_INDEX(trc, name, sp - beg);
(*sp)->trace(trc); Shape::trace(trc, *sp);
} }
} }

2
js/src/jsinfer.cpp
View File

@ -4196,7 +4196,7 @@ types::TypeObject::trace(JSTracer *trc)
int count = gc::FINALIZE_OBJECT_LAST - gc::FINALIZE_OBJECT0 + 1; int count = gc::FINALIZE_OBJECT_LAST - gc::FINALIZE_OBJECT0 + 1;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (emptyShapes[i]) if (emptyShapes[i])
emptyShapes[i]->trace(trc); Shape::trace(trc, emptyShapes[i]);
} }
} }

36
js/src/jsscope.cpp
View File

@ -1423,26 +1423,28 @@ PrintPropertyMethod(JSTracer *trc, char *buf, size_t bufsize)
#endif #endif
void void
Shape::trace(JSTracer *trc) const Shape::trace(JSTracer *trc, const Shape *shape)
{ {
if (IS_GC_MARKING_TRACER(trc)) do {
mark(); if (IS_GC_MARKING_TRACER(trc))
shape->mark();
MarkId(trc, id, "id"); MarkId(trc, shape->id, "id");
if (attrs & (JSPROP_GETTER | JSPROP_SETTER)) { if (shape->attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
if ((attrs & JSPROP_GETTER) && rawGetter) { if ((shape->attrs & JSPROP_GETTER) && shape->rawGetter) {
JS_SET_TRACING_DETAILS(trc, PrintPropertyGetterOrSetter, this, 0); JS_SET_TRACING_DETAILS(trc, PrintPropertyGetterOrSetter, shape, 0);
Mark(trc, getterObject()); Mark(trc, shape->getterObject());
}
if ((shape->attrs & JSPROP_SETTER) && shape->rawSetter) {
JS_SET_TRACING_DETAILS(trc, PrintPropertyGetterOrSetter, shape, 1);
Mark(trc, shape->setterObject());
}
} }
if ((attrs & JSPROP_SETTER) && rawSetter) {
JS_SET_TRACING_DETAILS(trc, PrintPropertyGetterOrSetter, this, 1);
Mark(trc, setterObject());
}
}
if (isMethod()) { if (shape->isMethod()) {
JS_SET_TRACING_DETAILS(trc, PrintPropertyMethod, this, 0); JS_SET_TRACING_DETAILS(trc, PrintPropertyMethod, shape, 0);
Mark(trc, &methodObject()); Mark(trc, &shape->methodObject());
} }
} while ((shape = shape->parent) != NULL && !shape->marked());
} }

2
js/src/jsscope.h
View File

@ -592,7 +592,7 @@ struct Shape : public JSObjectMap
inline bool isSharedPermanent() const; inline bool isSharedPermanent() const;
void trace(JSTracer *trc) const; static void trace(JSTracer *trc, const Shape *shape);
bool hasSlot() const { return (attrs & JSPROP_SHARED) == 0; } bool hasSlot() const { return (attrs & JSPROP_SHARED) == 0; }

4
js/src/jsscopeinlines.h
View File

@ -159,9 +159,7 @@ JSObject::trace(JSTracer *trc)
} }
/* Trace our property tree or dictionary ancestor line. */ /* Trace our property tree or dictionary ancestor line. */
do { js::Shape::trace(trc, shape);
shape->trace(trc);
} while ((shape = shape->parent) != NULL && !shape->marked());
} }
namespace js { namespace js {

2
js/src/jsscript.cpp
View File

@ -294,7 +294,7 @@ void
Bindings::trace(JSTracer *trc) Bindings::trace(JSTracer *trc)
{ {
for (const Shape *shape = lastBinding; shape; shape = shape->previous()) for (const Shape *shape = lastBinding; shape; shape = shape->previous())
shape->trace(trc); Shape::trace(trc, shape);
} }
} /* namespace js */ } /* namespace js */