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 945844 - Fix build error when compiling with GGC enabled and initialise store buffer reentry check member r=sfink

Browse Source
This commit is contained in:
Jon Coppeard 2013-12-04 11:02:47 +00:00
parent d57acc87b4
commit e5ae6935a1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/gc/StoreBuffer.h
View File

@ -398,7 +398,8 @@ class StoreBuffer
explicit StoreBuffer(JSRuntime *rt, const Nursery &nursery) explicit StoreBuffer(JSRuntime *rt, const Nursery &nursery)
: bufferVal(), bufferCell(), bufferSlot(), bufferWholeCell(), : bufferVal(), bufferCell(), bufferSlot(), bufferWholeCell(),
bufferRelocVal(), bufferRelocCell(), bufferGeneric(), bufferRelocVal(), bufferRelocCell(), bufferGeneric(),
runtime_(rt), nursery_(nursery), aboutToOverflow_(false), enabled_(false) runtime_(rt), nursery_(nursery), aboutToOverflow_(false), enabled_(false),
entered(false)
{ {
} }

2
js/src/jsweakmap.cpp
View File

@ -277,7 +277,7 @@ WeakMapPostWriteBarrier(JSRuntime *rt, ObjectValueMap *map, JSObject *key)
* This will automatically ensure that barriers do not fire during GC. * This will automatically ensure that barriers do not fire during GC.
*/ */
typedef WeakMap<JSObject *, Value> UnbarrieredObjectValueMap; typedef WeakMap<JSObject *, Value> UnbarrieredObjectValueMap;
typedef HashKeyRef<UnbarrieredObjectValueMap, JSObject *> Ref; typedef gc::HashKeyRef<UnbarrieredObjectValueMap, JSObject *> Ref;
if (key && IsInsideNursery(rt, key)) if (key && IsInsideNursery(rt, key))
rt->gcStoreBuffer.putGeneric(Ref(reinterpret_cast<UnbarrieredObjectValueMap *>(map), key)); rt->gcStoreBuffer.putGeneric(Ref(reinterpret_cast<UnbarrieredObjectValueMap *>(map), key));
#endif #endif