chore(ssa refactor): Simplify inlining pass and fix inlining failure#1337
Merged
kevaundray merged 4 commits intomasterfrom May 12, 2023
Merged
chore(ssa refactor): Simplify inlining pass and fix inlining failure#1337kevaundray merged 4 commits intomasterfrom
kevaundray merged 4 commits intomasterfrom
Conversation
Contributor
Author
|
To elaborate, previously the code in that issue would compile to (after inlining): Note the extra blocks in main. The function being passed through block parameters made it so inlining couldn't see what function was referred to by |
kevaundray
approved these changes
May 11, 2023
kevaundray
approved these changes
May 12, 2023
TomAFrench
added a commit
that referenced
this pull request
May 17, 2023
* master: (66 commits) feat(nargo)!: retire print-acir in favour of flag (#1328) chore(ssa): enable cse for assert (#1350) chore(ssa refactor): Add basic instruction simplification (#1329) chore(noir): Release 0.6.0 (#1279) feat: enable to_radix for any field element (#1343) chore(ssa refactor): Simplify inlining pass and fix inlining failure (#1337) chore!: Update to acvm 0.11.0 (#1322) feat: Add ECDSA secp256k1 builtin test (#1294) chore: add support for encoding/decoding inputs from JSON (#1325) feat: Issue an error when attempting to use a `return` expression (#1330) chore(ssa refactor): Fix inlining bug (#1335) fix: to-bits and to-radix for > 128 bits (#1312) chore(parser): Parser error optimisation (#1292) chore(ssa refactor): Implement function inlining (#1293) chore: fix installation link in readme (#1326) chore: fix installation link in readme (#1326) feat(stdlib): Add keccak (#1249) fix: Parsing nested generics (#1319) chore(ssa refactor): Document some SSA-gen functions (#1321) fix: Assigning to tuple fields (#1318) ...
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
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.
Related issue(s)
Resolves #
Description
Summary of changes
This simplifies the inlining pass by removing the extra block that is inserted for return instructions to jump to. Instead, when a function call is inlined we just switch back to the same block as the return instruction. The result is fewer blocks created which allows the code in issue #1327 to compile properly in the ssa refactoring without needing a block simplification pass afterward and subsequent second inlining.
Dependency additions / changes
Test additions / changes
I've added a unit test for the issue in #1327, although the issue is still open since the experimental ssa refactor is not ready to be the default IR.
Checklist
cargo fmtwith default settings.Documentation needs
Additional context