Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(ssa refactor): Fix no returns & duplicate main #1243

Merged
merged 11 commits into from
Apr 28, 2023
Merged

chore(ssa refactor): Fix no returns & duplicate main #1243

merged 11 commits into from
Apr 28, 2023

Conversation

jfecher
Copy link
Contributor

@jfecher jfecher commented Apr 27, 2023

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:

  • Functions did not terminate in a return instruction
  • main function 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_function with 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 now current_function and current_block must be optional inside of it.

Dependency additions / changes

Test additions / changes

Checklist

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt with default settings.
  • I have linked this PR to the issue(s) that it resolves.
  • I have reviewed the changes on GitHub, line by line.
  • I have ensured all changes are covered in the description.

Documentation needs

  • This PR requires documentation updates when merged.

Additional context

@kevaundray
Copy link
Contributor

Its also showing the intrinsics PR as new, so it may be a bad merge

@jfecher
Copy link
Contributor Author

jfecher commented Apr 27, 2023

@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

@jfecher
Copy link
Contributor Author

jfecher commented Apr 27, 2023

Nevermind, it was indeed a bad automatic merge. Not sure why there weren't merge conflicts there.

jfecher
jfecher commented Apr 28, 2023
View reviewed changes
Copy link
Contributor Author

@jfecher jfecher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the Option<Function> changes to the builder. I instead opted for popping from the function queue within the builder's constructor

@kevaundray kevaundray enabled auto-merge April 28, 2023 15:35
@kevaundray kevaundray added this pull request to the merge queue Apr 28, 2023
Merged via the queue into master with commit ed4691b Apr 28, 2023
@kevaundray kevaundray deleted the jf/ssa-fixes branch April 28, 2023 16:10
TomAFrench added a commit that referenced this pull request Apr 29, 2023
@TomAFrench
Merge branch 'master' into mikeneuder-20230212-1
e90e915 
* 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
@TomAFrench
Merge branch 'master' into joss/smt
65cc770 
* 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)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevaundray kevaundray kevaundray approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jfecher @kevaundray