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

Bug 774104 - Add a read barrier when rooting JS objects (r=mccr8)

Browse Source
This commit is contained in:
Bill McCloskey 2012-07-15 14:37:15 -07:00
parent 4f7302574b
commit 2ffb100c36
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/src/jsgc.cpp
View File

@ -1248,6 +1248,15 @@ js_AddGCThingRoot(JSContext *cx, void **rp, const char *name)
JS_FRIEND_API(JSBool)
js_AddRootRT(JSRuntime *rt, jsval *vp, const char *name)
{
/*
* Sometimes Firefox will hold weak references to objects and then convert
* them to strong references by calling AddRoot (e.g., via PreserveWrapper,
* or ModifyBusyCount in workers). We need a read barrier to cover these
* cases.
*/
if (rt->gcIncrementalState == MARK)
IncrementalValueBarrier(*vp);
return !!rt->gcRootsHash.put((void *)vp,
RootInfo(name, JS_GC_ROOT_VALUE_PTR));
}
@ -1255,6 +1264,15 @@ js_AddRootRT(JSRuntime *rt, jsval *vp, const char *name)
JS_FRIEND_API(JSBool)
js_AddGCThingRootRT(JSRuntime *rt, void **rp, const char *name)
{
/*
* Sometimes Firefox will hold weak references to objects and then convert
* them to strong references by calling AddRoot (e.g., via PreserveWrapper,
* or ModifyBusyCount in workers). We need a read barrier to cover these
* cases.
*/
if (rt->gcIncrementalState == MARK)
IncrementalReferenceBarrier(*rp);
return !!rt->gcRootsHash.put((void *)rp,
RootInfo(name, JS_GC_ROOT_GCTHING_PTR));
}
@ -1743,6 +1761,15 @@ js_LockGCThingRT(JSRuntime *rt, void *thing)
if (!thing)
return true;
/*
* Sometimes Firefox will hold weak references to objects and then convert
* them to strong references by calling AddRoot (e.g., via PreserveWrapper,
* or ModifyBusyCount in workers). We need a read barrier to cover these
* cases.
*/
if (rt->gcIncrementalState == MARK)
IncrementalReferenceBarrier(thing);
if (GCLocks::Ptr p = rt->gcLocksHash.lookupWithDefault(thing, 0)) {
p->value++;
return true;