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

Bug 952551 - Fix an exact rooting hazard in Shape::dump; r=sfink

Browse Source
This commit is contained in:
Terrence Cole 2013-12-20 10:16:11 -08:00
parent fe4a7a2ab1
commit 3022060e32
3 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsgc.cpp
View File

@ -4160,10 +4160,6 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
}
}
#ifdef DEBUG
PropertyTree::dumpShapes(rt);
#endif
{
gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_DESTROY);

39
js/src/jspropertytree.cpp
View File

@ -284,6 +284,9 @@ KidsPointer::checkConsistency(Shape *aKid) const
void
Shape::dump(JSContext *cx, FILE *fp) const
{
/* This is only used from gdb, so allowing GC here would just be confusing. */
gc::AutoSuppressGC suppress(cx);
jsid propid = this->propid();
JS_ASSERT(!JSID_IS_VOID(propid));
@ -296,8 +299,8 @@ Shape::dump(JSContext *cx, FILE *fp) const
str = JSID_TO_ATOM(propid);
} else {
JS_ASSERT(JSID_IS_OBJECT(propid));
RootedValue v(cx, IdToValue(propid));
JSString *s = ToStringSlow<CanGC>(cx, v);
Value v = IdToValue(propid);
JSString *s = ToStringSlow<NoGC>(cx, v);
fputs("object ", fp);
str = s ? s->ensureLinear(cx) : nullptr;
}
@ -370,36 +373,4 @@ Shape::dumpSubtree(JSContext *cx, int level, FILE *fp) const
}
}
void
js::PropertyTree::dumpShapes(JSRuntime *rt)
{
static bool init = false;
static FILE *dumpfp = nullptr;
if (!init) {
init = true;
const char *name = getenv("JS_DUMP_SHAPES_FILE");
if (!name)
return;
dumpfp = fopen(name, "a");
}
if (!dumpfp)
return;
fprintf(dumpfp, "rt->gcNumber = %lu", (unsigned long)rt->gcNumber);
for (gc::GCCompartmentsIter c(rt); !c.done(); c.next()) {
fprintf(dumpfp, "*** Compartment %p ***\n", (void *)c.get());
/*
typedef JSCompartment::EmptyShapeSet HS;
HS &h = c->emptyShapes;
for (HS::Range r = h.all(); !r.empty(); r.popFront()) {
Shape *empty = r.front();
empty->dumpSubtree(rt, 0, dumpfp);
putc('\n', dumpfp);
}
*/
}
}
#endif

4
js/src/jspropertytree.h
View File

@ -99,10 +99,6 @@ class PropertyTree
Shape *newShape(ExclusiveContext *cx);
Shape *getChild(ExclusiveContext *cx, Shape *parent, uint32_t nfixed, const StackShape &child);
Shape *lookupChild(ThreadSafeContext *cx, Shape *parent, const StackShape &child);
#ifdef DEBUG
static void dumpShapes(JSRuntime *rt);
#endif
};
} /* namespace js */