[Compiler] Support compilation for conditional returns #3816
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
SupunS
changed the title
SupunS
force-pushed
the
supun/compile-returns
branch
2 times, most recently
from
5dcf14f to
af6cffb
Compare
SupunS
force-pushed
the
supun/compile-returns
branch
from
af6cffb to
a4fb860
Compare
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:feature/compiler commit e6f27ac Collapsed results for better readability
|
SupunS
force-pushed
the
supun/compile-returns
branch
from
b42d50a to
9926433
Compare
SupunS
force-pushed
the
supun/compile-returns
branch
from
9926433 to
3cd94a0
Compare
SupunS
commented
Mar 20, 2025
Comment on lines
+538
to
+547
| desugaredDecl := d.desugarDeclaration(declaration.FunctionDeclaration).(*ast.FunctionDeclaration) | ||
| if desugaredDecl == declaration.FunctionDeclaration { | ||
| return declaration | ||
| } | ||
|
|
||
| return ast.NewSpecialFunctionDeclaration( | ||
| d.memoryGauge, | ||
| declaration.Kind, | ||
| desugaredDecl, | ||
| ) |
There was a problem hiding this comment.
Unrelated fix: Initializers wasn't getting desugared (hence conditions in initializers wasn't working)
Comment on lines
+559
to
+567
| prevInheritedFuncsWithConditions := d.inheritedFuncsWithConditions | ||
| prevEnclosingInterfaceType := d.enclosingInterfaceType | ||
|
|
||
| d.inheritedFuncsWithConditions = d.inheritedFunctionsWithConditions(compositeType) | ||
| d.enclosingInterfaceType = nil | ||
|
|
||
| defer func() { | ||
| d.inheritedFuncsWithConditions = prevInheritedFuncs | ||
| d.inheritedFuncsWithConditions = prevInheritedFuncsWithConditions | ||
| d.enclosingInterfaceType = prevEnclosingInterfaceType |
There was a problem hiding this comment.
Also an unrelated fix, but needed for the FT test. Composite types can be inside interfaces, in the form of events. And events have initializer functions, that should be desugar-ed/compiled. This path was uncovered by the desugar-ing of initializers (fix) above.
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.
Closes #3772
Description
Design:
When a return statement is being compiled, if the enclosing function:
masterbranchFiles changedin the Github PR explorer