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 867426 - Extra cleanups identified in review; r=jonco

Browse Source 
--HG--
extra : rebase_source : 5dd22eabd18112b5a6bfbb53ea3737ffcd46d40f
This commit is contained in:
Terrence Cole 2013-05-01 10:25:24 -07:00
parent 21a7b09932
commit 72049981ca
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/gc/Marking.cpp
View File

@ -698,7 +698,7 @@ gc::MarkCrossCompartmentObjectUnbarriered(JSTracer *trc, JSObject *src, JSObject
void
gc::MarkCrossCompartmentScriptUnbarriered(JSTracer *trc, JSObject *src, JSScript **dst,
const char *name)
const char *name)
{
if (ShouldMarkCrossCompartment(trc, src, *dst))
MarkScriptUnbarriered(trc, dst, name);

6
js/src/gc/RootMarking.cpp
View File

@ -485,7 +485,7 @@ AutoGCRooter::trace(JSTracer *trc)
AutoObjectObjectHashMap::HashMapImpl &map = static_cast<AutoObjectObjectHashMap *>(this)->map;
for (AutoObjectObjectHashMap::Enum e(map); !e.empty(); e.popFront()) {
mozilla::DebugOnly<JSObject *> key = e.front().key;
MarkObjectRoot(trc, (JSObject **) &e.front().key, "AutoObjectObjectHashMap key");
MarkObjectRoot(trc, const_cast<JSObject **>(&e.front().key), "AutoObjectObjectHashMap key");
JS_ASSERT(key == e.front().key); // Needs rewriting for moving GC, see bug 726687.
MarkObjectRoot(trc, &e.front().value, "AutoObjectObjectHashMap value");
}
@ -497,7 +497,7 @@ AutoGCRooter::trace(JSTracer *trc)
AutoObjectUnsigned32HashMap::HashMapImpl &map = self->map;
for (AutoObjectUnsigned32HashMap::Enum e(map); !e.empty(); e.popFront()) {
mozilla::DebugOnly<JSObject *> key = e.front().key;
MarkObjectRoot(trc, (JSObject **) &e.front().key, "AutoObjectUnsignedHashMap key");
MarkObjectRoot(trc, const_cast<JSObject **>(&e.front().key), "AutoObjectUnsignedHashMap key");
JS_ASSERT(key == e.front().key); // Needs rewriting for moving GC, see bug 726687.
}
return;
@ -508,7 +508,7 @@ AutoGCRooter::trace(JSTracer *trc)
AutoObjectHashSet::HashSetImpl &set = self->set;
for (AutoObjectHashSet::Enum e(set); !e.empty(); e.popFront()) {
mozilla::DebugOnly<JSObject *> obj = e.front();
MarkObjectRoot(trc, (JSObject **) &e.front(), "AutoObjectHashSet value");
MarkObjectRoot(trc, const_cast<JSObject **>(&e.front()), "AutoObjectHashSet value");
JS_ASSERT(obj == e.front()); // Needs rewriting for moving GC, see bug 726687.
}
return;