Skip to content

fix(experimental elaborator): Fix definition kind of globals and tuple patterns with --use-elaborator flag #5139

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

Merged
jfecher merged 1 commit into from
May 30, 2024
Merged

fix(experimental elaborator): Fix definition kind of globals and tuple patterns with --use-elaborator flag #5139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/noirc_frontend/src/elaborator/patterns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl<'context> Elaborator<'context> {
HirPattern::Mutable(Box::new(pattern), location)
}
Pattern::Tuple(fields, span) => {
let field_types = match expected_type {
let field_types = match expected_type.follow_bindings() {
Type::Tuple(fields) => fields,
Type::Error => Vec::new(),
expected_type => {
Expand Down
10 changes: 6 additions & 4 deletions compiler/noirc_frontend/src/elaborator/statements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@ impl<'context> Elaborator<'context> {

// To apply the changes from the fresh id created in elaborate_let to this global
// we need to change the definition kind and update the type.
let definition_id = self.interner.get_global(global_id).definition_id;
self.interner.definition_mut(definition_id).kind = DefinitionKind::Global(global_id);

assert_eq!(new_ids.len(), 1, "Globals should only define 1 value");
let definition_type = self.interner.definition_type(new_ids[0].id);
let new_id = new_ids[0].id;

self.interner.definition_mut(new_id).kind = DefinitionKind::Global(global_id);

let definition_id = self.interner.get_global(global_id).definition_id;
let definition_type = self.interner.definition_type(new_id);
self.interner.push_definition_type(definition_id, definition_type);

self.interner.replace_statement(statement_id, let_statement);
Expand Down