transform: rewrite result/return before annotate #336
Merged
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.
Previously we unconditionally rewrite
return
with the assumption that all return belongs to the procedure being rewritten. This does not hold when nested procedures are used. This issue was exposed thanks to nim-works/nimskull#1503 breaking an implicit dependency on the compiler's automatic result transformation for implicit returns.This commit separate return rewrite from annotate and merge it with the result rewrite, as both require awareness of nested procedures.