Account for new identity comparison hashes in Sorbet internals #1732
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
dirceu
approved these changes
Dec 15, 2023
Morriar
approved these changes
Dec 15, 2023
paracycle
reviewed
Dec 15, 2023
Comment on lines
+70
to
+74
| final_methods = if sorbet_supports?(:identity_comparison) | ||
| modules_with_final[signature.owner] | ||
| else | ||
| modules_with_final[signature.owner.object_id] | ||
| end |
There was a problem hiding this comment.
Could we not have done:
final_methods = modules_with_final[signature.owner] || modules_with_final[signature.owner.object_id]There was a problem hiding this comment.
We could. I don't mind either style. Do you prefer getting rid of the feature check?
There was a problem hiding this comment.
Tbh, yes, I would like to remove the feature check if we can. We've been preserving feature checks only for cases where we would have to do something different without an alternative way of doing it. In this case, I think we have a perfectly good alternative to do look up twice if we have to, and we know we can never get wrong matches.
There was a problem hiding this comment.
Good call!
(For the record, this was fixed in #1734)
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.
Motivation
The build in main is still breaking because of the changes in sorbet/sorbet#7531.
Now that the hashes are compared by identity, we can no longer use the
object_idto figure out if a signature is final or not.Implementation
I added a feature check so that we decide what to do based on the Sorbet version.
We couldn't force the hash to be compared by identity without breaking Sorbet's own internals, so I don't think there are any other approaches we can take.
Tests
Existing tests should continue to pass.