chore(refactor): Remove globals field on Ssa object and use only the shared globals graph #7156
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
michaeljklein
requested changes
Jan 22, 2025
| return brillig; | ||
| } | ||
|
|
||
| let func_id = brillig_reachable_function_ids |
There was a problem hiding this comment.
What is this func_id? Is it this Function?
There was a problem hiding this comment.
No it is just the first function from brillig_reachable_function_ids. The globals graph is computed a single time and shared among all functions (see #7040), so we can use any func id here. I switched to using self.main_id to be more explicit.
| @@ -25,7 +26,8 @@ impl Ssa { | |||
| let mut context = Context::default(); | |||
| context.populate_functions(&self.functions); | |||
| for function in self.functions.values_mut() { | |||
| context.normalize_ids(function, &self.globals); | |||
| let globals = (*function.dfg.globals).clone(); | |||
There was a problem hiding this comment.
Is this clone before passing a reference avoidable?
There was a problem hiding this comment.
It is not as GlobalsGraph cannot be moved out of Arc as it does not implement Copy. I have moved it out of the loop though.
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.
Description
Problem*
No issue, but just a general refactor. We have repeated declaration of globals (the shared
globals: Arc<GlobalsGraph>field onDataFlowGraphand theglobals: FunctiononSsa). We need the globals field on the DFG for resolving constants #7040. However, the globals field on theSsaobject is only used by the SSA printer and the brillig codegen. Which in both case could use the globals graph from any function.Summary*
I removed
globals: FunctionfromSsaand use the globals graph from a function in the places where theSsafield was being used.Certain interfaces such as the printer and Brillig codegen still utilize the
DataFlowGraphtype so some conversions from aGlobalsGraphto aDataFlowGraphwere necessary to avoid larger changes.Additional Context
Documentation*
Check one:
PR Checklist*
cargo fmton default settings.