Sync these mirrored sources with their primaries at js/src/jsdhash.[ch] (see bug 62164, r=shaver, sr=jband).

xpcom/ds/pldhash.c

@@ -100,7 +100,7 @@ PL_DHashMatchEntryStub(PLDHashTable *table,
                        const PLDHashEntryHdr *entry,
                        const void *key)
 {
-    PLDHashEntryStub *stub = (PLDHashEntryStub *)entry;
+    const PLDHashEntryStub *stub = (const PLDHashEntryStub *)entry;
 
     return stub->key == key;
 }
@@ -459,8 +459,7 @@ ChangeTable(PLDHashTable *table, int deltaLog2)
                                    oldEntry->keyHash, PL_DHASH_ADD);
             PR_ASSERT(PL_DHASH_ENTRY_IS_FREE(newEntry));
             moveEntry(table, oldEntry, newEntry);
-            newEntry->keyHash =
-                oldEntry->keyHash | (newEntry->keyHash & COLLISION_FLAG);
+            newEntry->keyHash = oldEntry->keyHash;
         }
         oldEntryAddr += entrySize;
     }

xpcom/ds/pldhash.h

@@ -235,7 +235,8 @@ typedef void
  * moved via moveEntry callbacks.
  */
 typedef const void *
-(* PR_CALLBACK PLDHashGetKey)    (PLDHashTable *table, PLDHashEntryHdr *entry);
+(* PR_CALLBACK PLDHashGetKey)    (PLDHashTable *table,
+                                      PLDHashEntryHdr *entry);
 
 /*
  * Compute the hash code for a given key to be looked up, added, or removed