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

Backed out changeset f97f196dcb58 - bug 480301 needs more work

Browse Source
This commit is contained in:
Igor Bukanov 2009-04-15 23:33:46 +02:00
parent 7a9b1b6e92
commit e2941e5370
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsapi.cpp
View File

@ -955,8 +955,6 @@ JS_EndRequest(JSContext *cx)
JS_ASSERT(cx->requestDepth > 0);
JS_ASSERT(cx->outstandingRequests > 0);
if (cx->requestDepth == 1) {
js_LeaveTrace(cx); /* for GC safety */
/* Lock before clearing to interlock with ClaimScope, in jslock.c. */
rt = cx->runtime;
JS_LOCK_GC(rt);

4
js/src/jsgc.cpp
View File

@ -3389,10 +3389,8 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind)
for (link = head->next; link != head; link = link->next) {
acx = CX_FROM_THREAD_LINKS(link);
JS_ASSERT(acx->thread == cx->thread);
if (acx->requestDepth) {
js_LeaveTrace(acx);
if (acx->requestDepth)
requestDebit++;
}
}
}
if (requestDebit) {

1
js/src/jslock.cpp
View File

@ -589,7 +589,6 @@ ClaimTitle(JSTitle *title, JSContext *cx)
*/
saveDepth = cx->requestDepth;
if (saveDepth) {
js_LeaveTrace(cx);
cx->requestDepth = 0;
if (rt->gcThread != cx->thread) {
JS_ASSERT(rt->requestCount > 0);