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 800481 - Remove unnecessary second arg from HashTable::hash{1,2}. r=luke.

Browse Source
This commit is contained in:
Nicholas Nethercote 2012-10-11 16:36:29 -07:00
parent b648831e48
commit 5a8be2dcf1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/public/HashTable.h
View File

@ -388,8 +388,8 @@ class HashTable : private AllocPolicy
}
private:
static HashNumber hash1(HashNumber hash0, uint32_t shift) {
return hash0 >> shift;
HashNumber hash1(HashNumber hash0) const {
return hash0 >> hashShift;
}
struct DoubleHash {
@ -397,7 +397,7 @@ class HashTable : private AllocPolicy
HashNumber sizeMask;
};
DoubleHash hash2(HashNumber curKeyHash, uint32_t hashShift) const {
DoubleHash hash2(HashNumber curKeyHash) const {
unsigned sizeLog2 = sHashBits - hashShift;
DoubleHash dh = {
((curKeyHash << sizeLog2) >> hashShift) | 1,
@ -433,7 +433,7 @@ class HashTable : private AllocPolicy
METER(stats.searches++);
/* Compute the primary hash address. */
HashNumber h1 = hash1(keyHash, hashShift);
HashNumber h1 = hash1(keyHash);
Entry *entry = &table[h1];
/* Miss: return space for a new entry. */
@ -449,7 +449,7 @@ class HashTable : private AllocPolicy
}
/* Collision: double hash. */
DoubleHash dh = hash2(keyHash, hashShift);
DoubleHash dh = hash2(keyHash);
/* Save the first removed entry pointer so we can recycle later. */
Entry *firstRemoved = NULL;
@ -495,7 +495,7 @@ class HashTable : private AllocPolicy
/* N.B. the |keyHash| has already been distributed. */
/* Compute the primary hash address. */
HashNumber h1 = hash1(keyHash, hashShift);
HashNumber h1 = hash1(keyHash);
Entry *entry = &table[h1];
/* Miss: return space for a new entry. */
@ -505,7 +505,7 @@ class HashTable : private AllocPolicy
}
/* Collision: double hash. */
DoubleHash dh = hash2(keyHash, hashShift);
DoubleHash dh = hash2(keyHash);
while(true) {
JS_ASSERT(!entry->isRemoved());
@ -632,8 +632,8 @@ class HashTable : private AllocPolicy
}
HashNumber keyHash = src->getKeyHash();
HashNumber h1 = hash1(keyHash, hashShift);
DoubleHash dh = hash2(keyHash, hashShift);
HashNumber h1 = hash1(keyHash);
DoubleHash dh = hash2(keyHash);
Entry *tgt = &table[h1];
while (true) {
if (!tgt->hasCollision()) {