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

Back out e0cb9fb30750 (bug 707051) for test failures

Browse Source
This commit is contained in:
Phil Ringnalda 2011-12-04 18:48:54 -08:00
parent b69507846f
commit 7233739fab
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsapi.cpp
View File

@ -4183,7 +4183,7 @@ JS_NextProperty(JSContext *cx, JSObject *iterobj, jsid *idp)
JS_ASSERT(shape->isEmptyShape());
*idp = JSID_VOID;
} else {
iterobj->setPrivate(const_cast<Shape *>(shape->previous().get()));
iterobj->setPrivate(const_cast<Shape *>(shape->previous()));
*idp = shape->propid();
}
} else {

7
js/src/jsgcmark.cpp
View File

@ -735,7 +735,6 @@ restart:
else if (JS_UNLIKELY(JSID_IS_OBJECT(id)))
PushMarkStack(gcmarker, JSID_TO_OBJECT(id));
/* We need the loop here to prevent unbounded recursion. */
shape = shape->previous();
if (shape && shape->markIfUnmarked(gcmarker->getMarkColor()))
goto restart;
@ -975,11 +974,13 @@ MarkChildren(JSTracer *trc, JSScript *script)
void
MarkChildren(JSTracer *trc, const Shape *shape)
{
restart:
MarkBaseShapeUnbarriered(trc, shape->base(), "base");
MarkIdUnbarriered(trc, shape->maybePropid(), "propid");
if (shape->previous())
MarkShape(trc, shape->previous(), "parent");
shape = shape->previous();
if (shape)
goto restart;
}
void

2
js/src/jsscope.h
View File

@ -592,7 +592,7 @@ struct Shape : public js::gc::Cell
return !(flags & NON_NATIVE);
}
const HeapPtrShape &previous() const {
const js::Shape *previous() const {
return parent;
}