Make two strict in its key arguments
#233
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`two` wasn't strict in its key arguments. We thought this was okay, because its key arguments are always in WHNF and it's marked `INLINE`. But `two` is defined as a *recursive* `go` function (I haven't looked into why), which can't be inlined. I believe that's the reason GHC doesn't *realize* that the keys are in WHNF. Anyway, the end result was that `two` would defer the creation of the `Leaf` values stored in the array, producing very silly thunks. Fixes haskell-unordered-containers#232
|
@mantasg, could you please test against this commit? |
|
I realized something else.... |
Previously, we passed `two` two unpacked key-value pairs: `hx`, `kx`, `vx`, `hy`, `ky`, `vy`. But at every call site, we already have `Leaf hy (L ky vy)`. So instead of building a new copy of the leaf, we can just pass the one we have to `two`.
|
@mantasg, actually, could you test it at the second commit here? I turned things around a bit. |
|
@treeowl, I ran the tests with the changes (at |
|
Great! I'll merge. |
|
Thanks for bringing this to my attention. |
|
No probs. Thanks for a quick response! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
twowasn't strict in its key arguments. We thought this was okay,because its key arguments are always in WHNF and it's marked
INLINE. Buttwois defined as a recursivegofunction(I haven't looked into why), which can't be inlined. I believe
that's the reason GHC doesn't realize that the keys are in WHNF.
Anyway, the end result was that
twowould defer the creation ofthe
Leafvalues stored in the array, producing very silly thunks.Fixes #232