Skip to content

Commit c870162

Browse files
authored
Merge pull request scala/scala#7229 from joshlemer/issue/11149-set-subsetof
HashSet#subSetOf does not perform any hashing
2 parents e90fbf3 + 32ba3c1 commit c870162

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

library/src/scala/collection/immutable/ChampHashSet.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,10 @@ private final class BitmapIndexedSetNode[A](val dataMap: Int, val nodeMap: Int,
464464
payload0 == payload1
465465
} else {
466466
// Data x Node
467-
val payload = this.getPayload(indexFrom(this.dataMap, bitpos))
467+
val thisDataIndex = indexFrom(this.dataMap, bitpos)
468+
val payload = this.getPayload(thisDataIndex)
468469
val subNode = that.getNode(indexFrom(node.nodeMap, bitpos))
469-
val elementUnimprovedHash = payload.##
470+
val elementUnimprovedHash = getHash(thisDataIndex)
470471
val elementHash = improve(elementUnimprovedHash)
471472
subNode.contains(payload, elementUnimprovedHash, elementHash, shift + BitPartitionSize)
472473
}

0 commit comments

Comments
 (0)