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 1223519 - Remove unused rekeying logic from WeakMap; r=sfink

Browse Source
This commit is contained in:
Terrence Cole 2015-11-17 11:32:43 -08:00
parent 1e93981ca9
commit 46a8a4f3d1
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/src/jsweakmap.h
View File

@ -206,12 +206,8 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>,
if (!trc->isMarkingTracer()) {
// Trace keys only if weakMapAction() says to.
if (trc->weakMapAction() == TraceWeakMapKeysValues) {
for (Enum e(*this); !e.empty(); e.popFront()) {
Key key(e.front().key());
TraceEdge(trc, &key, "WeakMap entry key");
if (key != e.front().key())
e.rekeyFront(key);
}
for (Enum e(*this); !e.empty(); e.popFront())
TraceEdge(trc, &e.front().mutableKey(), "WeakMap entry key");
}
// Always trace all values (unless weakMapAction() is
@ -252,40 +248,30 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>,
bool markedAny = false;
for (Enum e(*this); !e.empty(); e.popFront()) {
Entry& entry(e.front());
Key key(entry.key());
// If the entry is live, ensure its key and value are marked.
bool keyIsMarked = gc::IsMarked(&key);
if (!keyIsMarked && keyNeedsMark(key)) {
TraceEdge(trc, &key, "proxy-preserved WeakMap entry key");
bool keyIsMarked = gc::IsMarked(&e.front().mutableKey());
if (!keyIsMarked && keyNeedsMark(e.front().key())) {
TraceEdge(trc, &e.front().mutableKey(), "proxy-preserved WeakMap entry key");
keyIsMarked = true;
markedAny = true;
}
if (keyIsMarked) {
if (!gc::IsMarked(&entry.value())) {
TraceEdge(trc, &entry.value(), "WeakMap entry value");
if (!gc::IsMarked(&e.front().value())) {
TraceEdge(trc, &e.front().value(), "WeakMap entry value");
markedAny = true;
}
if (e.front().key() != key)
e.rekeyFront(key);
} else if (trc->isWeakMarkingTracer()) {
// Entry is not yet known to be live. Record this weakmap and
// the lookup key in the list of weak keys. Also record the
// delegate, if any, because marking the delegate also marks
// the entry.
JS::GCCellPtr weakKey(extractUnbarriered(key));
JS::GCCellPtr weakKey(extractUnbarriered(e.front().key()));
gc::WeakMarkable markable(this, weakKey);
addWeakEntry(trc, weakKey, markable);
if (JSObject* delegate = getDelegate(key))
if (JSObject* delegate = getDelegate(e.front().key()))
addWeakEntry(trc, JS::GCCellPtr(delegate), markable);
MOZ_ASSERT(key == e.front().key()); // No moving
}
key.unsafeSet(nullptr); // Prevent destructor from running barriers.
}
return markedAny;
@ -325,11 +311,8 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>,
void sweep() override {
/* Remove all entries whose keys remain unmarked. */
for (Enum e(*this); !e.empty(); e.popFront()) {
Key k(e.front().key());
if (gc::IsAboutToBeFinalized(&k))
if (gc::IsAboutToBeFinalized(&e.front().mutableKey()))
e.removeFront();
else if (k != e.front().key())
e.rekeyFront(k);
}
/*
* Once we've swept, all remaining edges should stay within the