Skip to content

Fix regression in HashMap.{merge, ++}#8764

Merged
SethTisue merged 2 commits intoscala:2.12.xfrom
retronym:topic/hashmap-merge-regression
Feb 29, 2020
Merged

Fix regression in HashMap.{merge, ++}#8764
SethTisue merged 2 commits intoscala:2.12.xfrom
retronym:topic/hashmap-merge-regression

Conversation

@retronym
Copy link
Member

@retronym retronym commented Feb 28, 2020

Regressed in #8466

Fixes scala/scala-dev#672

@scala-jenkins scala-jenkins added this to the 2.12.12 milestone Feb 28, 2020
@retronym retronym requested a review from szeiger February 28, 2020 03:22
@retronym retronym modified the milestones: 2.12.12, 2.12.11 Feb 28, 2020
@retronym retronym added the prio:blocker release blocker (used only by core team, only near release time) label Feb 28, 2020
@retronym retronym force-pushed the topic/hashmap-merge-regression branch 2 times, most recently from 4ef8838 to e659245 Compare February 28, 2020 03:51
@retronym
Copy link
Member Author

This now aligns with the corresponding code in HashSet again.

image

@lrytz
Copy link
Member

lrytz commented Feb 28, 2020

The link in the commit message is wrong, it regressed in #8466. Let's fix it to avoid future confusion.

... in the way they construct the bitmap of the resulting node.

No behaviour change.
@retronym retronym force-pushed the topic/hashmap-merge-regression branch from 0190312 to cf3a6f1 Compare February 28, 2020 09:40
@SethTisue
Copy link
Member

Copy link
Contributor

@szeiger szeiger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as far as I understand the code. Clearly allBits was wrong because it's always 0 at that point.

@SethTisue
Copy link
Member

community build run green except for unrelated failures (scala/scala-dev#673)

@SethTisue SethTisue merged commit 49cec62 into scala:2.12.x Feb 29, 2020
hamzaremmal pushed a commit to hamzaremmal/scala3 that referenced this pull request May 2, 2025
…-regression

Fix regression in HashMap.{merge, ++}
hamzaremmal pushed a commit to scala/scala3 that referenced this pull request May 7, 2025
…-regression

Fix regression in HashMap.{merge, ++}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

prio:blocker release blocker (used only by core team, only near release time)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants