interpreter: pop GC frames when leaving multiple :enter blocks
#57186
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
vtjnash
reviewed
Jan 28, 2025
| @@ -606,8 +609,11 @@ static jl_value_t *eval_body(jl_array_t *stmts, interpreter_state *s, size_t ip, | |||
| // equivalent to jl_pop_handler(hand_n_leave), longjmping | |||
| // to the :enter code above instead, which handles cleanup | |||
| jl_handler_t *eh = ct->eh; | |||
| while (--hand_n_leave > 0) | |||
| while (--hand_n_leave > 0) { | |||
| // pop GC frames for any skipped handlers | |||
There was a problem hiding this comment.
The last frame doesn't include the PUSH'd frame (at jl_enter_handler(ct, &__eh); above), so I think you may need to move the jl_enter_handler(ct, &__eh); later?
There was a problem hiding this comment.
This is the second-to-last frame though
Keno
approved these changes
Jan 28, 2025
oscardssmith
added
bugfix
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Resolves #56062