Fixes #21235, #23602, #24978, #25018 #25030
Merged
+735
−553
Conversation
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
yglukhov
changed the title
|
|
|
timeouts seemed to be unrelated. |
|
Thanks for your hard work on this PR! Hint: mm: orc; opt: speed; options: -d:release |
narimiran
pushed a commit
that referenced
this pull request
Jul 8, 2025
Reworked closureiter transformation. - Convolutedly nested finallies should cause no problems now. - CurrentException state now follows nim runtime rules (pushes and pops appropriately), and mimics normal code, which is somewhat buggy, see #25031 - Previously state optimization (removing empty states or extra jumps) missed some opportunities, I've reimplemented it to do everything possible to optimize the states. At this point any extra states or jumps should be considered a bug. The resulting codegen (compiled binaries) is also slightly smaller. **BUT:** - I had to change C++ reraising logic, see expt.nim. Because with closure iters `currentException` is not always in sync with C++'s notion of current exception. From my tests and understanding of C++ runtime there should not be any problems, but I'm only 99% sure :) - I've reused `nfNoRewrite` flag in one specific case during the transformation. This flag is also used in term-rewriting logic. Again, 99% sure, these 2 scenarios will never intersect. (cherry picked from commit 36f8cef)
This was referenced Jul 9, 2025
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.
Reworked closureiter transformation.
The resulting codegen (compiled binaries) is also slightly smaller.
BUT:
currentExceptionis not always in sync with C++'s notion of current exception. From my tests and understanding of C++ runtime there should not be any problems, but I'm only 99% sure :)nfNoRewriteflag in one specific case during the transformation. This flag is also used in term-rewriting logic. Again, 99% sure, these 2 scenarios will never intersect.