chore(ssa refactor): Fix no returns & duplicate main#1243
Merged
kevaundray merged 11 commits intomasterfrom Apr 28, 2023
Merged
chore(ssa refactor): Fix no returns & duplicate main#1243kevaundray merged 11 commits intomasterfrom
kevaundray merged 11 commits intomasterfrom
Conversation
Contributor
|
Its also showing the intrinsics PR as new, so it may be a bad merge |
Contributor
Author
|
@kevaundray Since this was based off the intrinsics PR it looked like it includes that change as well. I've just merged master again so it should be fixed now |
Contributor
Author
|
Nevermind, it was indeed a bad automatic merge. Not sure why there weren't merge conflicts there. |
jfecher
commented
Apr 27, 2023
jfecher
commented
Apr 27, 2023
jfecher
commented
Apr 28, 2023
Contributor
Author
jfecher
left a comment
jfecher
left a comment
There was a problem hiding this comment.
Removed the Option<Function> changes to the builder. I instead opted for popping from the function queue within the builder's constructor
kevaundray
approved these changes
Apr 28, 2023
TomAFrench
added a commit
that referenced
this pull request
Apr 29, 2023
* master: (223 commits) chore(noir): Release 0.5.0 (#1202) chore(ci): Utilize new workflow to build binaries (#1250) chore(ssa refactor): Fix loading from mutable parameters (#1248) fix(wasm): add std after dependencies (#1245) chore(ssa refactor): Fix no returns & duplicate main (#1243) chore(ssa refactor): Implement intrinsics (#1241) chore(ssa refactor): Implement first-class functions (#1238) chore: address clippy warnings (#1239) chore(ssa refactor): Implement function calls (#1235) chore(ssa refactor): Implement mutable and immutable variables (#1234) chore(ssa refactor): Fix recursive printing of blocks (#1230) feat(noir): added assert keyword (#1227) chore(ssa refactor): Implement ssa-gen for indexing, cast, constrain, if, unary (#1225) feat(noir): added `distinct` keyword (#1219) chore(nargo): update panic message to suggest searching for similar issues (#1224) chore(ssa refactor): Update how instruction result types are retrieved (#1222) chore(ssa refactor): Implement ssa-gen for binary, block, tuple, extract-tuple-field, and semi expressions (#1217) chore: add RUST_BACKTRACE environment variable to nix config (#1216) chore(ssa): Add intial control flow graph (#1200) chore(ssa refactor): Handle codegen for literals (#1209) ...
TomAFrench
added a commit
that referenced
this pull request
May 2, 2023
* master: (63 commits) feat(nargo): Remove usage of `CompiledProgram` in CLI code and use separate ABI/bytecode (#1269) feat: add integration tests for bitshift operators (#1272) chore: Replace explicit if-elses with `FieldElement::from<bool>()` for boolean fields (#1266) chore(noir): constrain expr; -> assert(expr); (#1276) chore: fix clippy warning (#1270) chore(ssa refactor): Add all remaining doc comments to ssa generation pass (#1256) chore(noir): Release 0.5.1 (#1264) fix: Add Poseidon examples into integration tests (#1257) chore(nargo): replace `aztec_backend` with `acvm-backend-barretenberg` (#1226) chore(noir): Release 0.5.0 (#1202) chore(ci): Utilize new workflow to build binaries (#1250) chore(ssa refactor): Fix loading from mutable parameters (#1248) fix(wasm): add std after dependencies (#1245) chore(ssa refactor): Fix no returns & duplicate main (#1243) chore(ssa refactor): Implement intrinsics (#1241) chore(ssa refactor): Implement first-class functions (#1238) chore: address clippy warnings (#1239) chore(ssa refactor): Implement function calls (#1235) chore(ssa refactor): Implement mutable and immutable variables (#1234) chore(ssa refactor): Fix recursive printing of blocks (#1230) ...
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
2 participants
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
Some initial testing of the SSA-gen pass revealed it was mostly working as intended but had two obvious bugs so far:
mainfunction was duplicated twice.This PR fixes these. The first was a simple oversight, and the second was because we created our FunctionBuilder object initialized to build the main function, but in calling
SharedContext::get_or_queue_functionwith main's id to retrieve its translated ID, main was also queued to compile again, leaving us with 2 main functions. I've adjusted the flow here a bit to initialize FunctionBuilder to no function initially. The downside of this is that nowcurrent_functionandcurrent_blockmust be optional inside of it.Dependency additions / changes
Test additions / changes
Checklist
cargo fmtwith default settings.Documentation needs
Additional context