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

Back out f8c6a272f2dc. It was working on Try a few minutes ago, I swear! (r=red)

Browse Source
This commit is contained in:
Chris Leary
2010-06-26 18:09:07 -07:00
parent 0930573283
commit e4cd373469
16 changed files with 561 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsapi.cpp
View File

@@ -2442,8 +2442,8 @@ JS_GC(JSContext *cx)
LeaveTrace(cx);
/* Don't nuke active arenas if executing or compiling. */
if (cx->tempPool.currentIsFirst())
cx->tempPool.finish();
if (cx->tempPool.current == &cx->tempPool.first)
JS_FinishArenaPool(&cx->tempPool);
js_GC(cx, GC_NORMAL);
}
@@ -4131,7 +4131,7 @@ JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent)
JSUpvarArray *uva = fun->u.i.script->upvars();
JS_ASSERT(uva->length <= size_t(clone->dslots[-1]));
void *mark = cx->tempPool.getMark();
void *mark = JS_ARENA_MARK(&cx->tempPool);
jsuword *names = js_GetLocalNameArray(cx, fun, &cx->tempPool);
if (!names)
return NULL;
@@ -4155,7 +4155,7 @@ JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent)
}
break2:
cx->tempPool.release(mark);
JS_ARENA_RELEASE(&cx->tempPool, mark);
if (i < n)
return NULL;
}