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 580633 - Do less copying when adding elements to HashMap (r=bz)

Browse Source
This commit is contained in:
Luke Wagner 2010-07-21 19:01:33 -07:00
parent 71a64382fa
commit 3dfee16b90
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
js/src/jshashtable.h
View File

@ -593,7 +593,12 @@ class HashTable : AllocPolicy
#endif
}
bool add(AddPtr &p, const T &t)
/*
* There is an important contract between the caller and callee for this
* function: if add() returns true, the caller must assign the T value
* which produced p before using the hashtable again.
*/
bool add(AddPtr &p, T **pentry)
{
ReentrancyGuard g(*this);
JS_ASSERT(mutationCount == p.mutationCount);
@ -630,7 +635,7 @@ class HashTable : AllocPolicy
}
}
p.entry->t = t;
*pentry = &p.entry->t;
p.entry->setLive(p.keyHash);
entryCount++;
#ifdef DEBUG
@ -842,8 +847,27 @@ class HashMap
* char val = p->value;
*/
typedef typename Impl::AddPtr AddPtr;
AddPtr lookupForAdd(const Lookup &l) const { return impl.lookupForAdd(l); }
bool add(AddPtr &p, const Key &k, const Value &v) { return impl.add(p,Entry(k,v)); }
AddPtr lookupForAdd(const Lookup &l) const {
return impl.lookupForAdd(l);
}
bool add(AddPtr &p, const Key &k, const Value &v) {
Entry *pentry;
if (!impl.add(p, &pentry))
return false;
const_cast<Key &>(pentry->key) = k;
pentry->value = v;
return true;
}
bool add(AddPtr &p, const Key &k) {
Entry *pentry;
if (!impl.add(p, &pentry))
return false;
const_cast<Key &>(pentry->key) = k;
return true;
}
bool relookupOrAdd(AddPtr &p, const Key &k, const Value &v) {
return impl.relookupOrAdd(p, k, Entry(k, v));
}
@ -989,8 +1013,17 @@ class HashSet
* Also see the definition of AddPtr in HashTable above.
*/
typedef typename Impl::AddPtr AddPtr;
AddPtr lookupForAdd(const Lookup &l) const { return impl.lookupForAdd(l); }
bool add(AddPtr &p, const T &t) { return impl.add(p,t); }
AddPtr lookupForAdd(const Lookup &l) const {
return impl.lookupForAdd(l);
}
bool add(AddPtr &p, const T &t) {
const T *pentry;
if (!impl.add(p, &pentry))
return false;
const_cast<T &>(*pentry) = t;
return true;
}
/*
* |all()| returns a Range containing |count()| elements: