Clear callInfo in Enumerable Java-based blocks#8389
Merged
headius merged 4 commits intojruby:masterfrom Oct 28, 2024
Merged
Conversation
Enumerable#to_a does not take keywords but also was not handling any incoming callInfo bits. As a result an incoming CALL_KEYWORD_EMPTY bit can get stuck and propagte through to the next call. This does not process any kwargs because it is effectively a block with signature like |a, *b| but whether it should do more than clearing callInfo is unknown. Fixes jruby#8382
See jruby#8382 and the same fix for Enumerable#to_a.
headius
changed the title
For jruby#8382 we added calls to resetCallInfo in Enumerable Java-based blocks for `to_a`, `to_h`, and `tally` because they could leave the CALL_KEYWORD_EMPTY bit stuck for a subsequent call and break kwarg processing. The Java block for Enumerable `chunk` also fails to clear callInfo, but since it immediately invokes `each` on self it is difficult or impossible to reproduce. each can't take kwargs without breaking, and clears callInfo when done so there's no way to observe the stuck bit. However, I believe we should still resetCallInfo here for sanitary reasons, and some weird Enumerable consumer in the future may find a way to hit this improbable case.
headius
force-pushed
the
clear_callinfo_in_enumerable
branch
from
e930581 to
44290af
Compare
headius
added a commit
to headius/jruby
that referenced
this pull request
Jan 8, 2025
When passing kwargs from a ruby2_keywords method to a core "real keywords" method, we lose the keywordiness of the incoming hash and raise an argument error for the arity mismatch. By using the same logic as IR here, we properly handle the incoming r2k hash. This same patch could be applied generally to all core methods that accept keywords, but given the rarity of r2k to core "real keywords" methods we have chosen to only do targeted fixes. This reduces the potential impact (versus a new, more general solution) and the required work (9.4.10 is eagerly awaited). We will explore more reliable, general improvements to core method kwarg handling in JRuby 10. Fixes jruby#8389.
headius
added a commit
to headius/jruby
that referenced
this pull request
Jan 8, 2025
When passing kwargs from a ruby2_keywords method to a core "real keywords" method, we lose the keywordiness of the incoming hash and raise an argument error for the arity mismatch. By using the same logic as IR here, we properly handle the incoming r2k hash. This same patch could be applied generally to all core methods that accept keywords, but given the rarity of r2k to core "real keywords" methods we have chosen to only do targeted fixes. This reduces the potential impact (versus a new, more general solution) and the required work (9.4.10 is eagerly awaited). We will explore more reliable, general improvements to core method kwarg handling in JRuby 10. Fixes jruby#8389.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Enumerable#to_a does not take keywords but also was not handling any incoming callInfo bits. As a result an incoming CALL_KEYWORD_EMPTY bit can get stuck and propagte through to the next call. This does not process any kwargs because it is effectively a block with signature like |a, *b| but whether it should do more than clearing callInfo is unknown.
Fixes #8382