Skip to content

fix: Don't lazily elaborate functions #5282

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
TomAFrench merged 1 commit into from
Jun 19, 2024
Merged

fix: Don't lazily elaborate functions #5282

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
13 changes: 1 addition & 12 deletions compiler/noirc_frontend/src/elaborator/patterns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ use crate::{
},
hir_def::{
expr::{HirIdent, ImplKind},
function::FunctionBody,
stmt::HirPattern,
},
macros_api::{HirExpression, Ident, Path, Pattern},
node_interner::{DefinitionId, DefinitionKind, DependencyId, ExprId, GlobalId, TraitImplKind},
node_interner::{DefinitionId, DefinitionKind, ExprId, GlobalId, TraitImplKind},
Shared, StructType, Type, TypeBindings,
};

Expand Down Expand Up @@ -415,16 +414,6 @@ impl<'context> Elaborator<'context> {
match self.interner.definition(hir_ident.id).kind {
DefinitionKind::Function(id) => {
if let Some(current_item) = self.current_item {
// Lazily evaluate functions found within globals if necessary.
// Otherwise if we later attempt to evaluate the global it will
// see an empty function body.
if matches!(current_item, DependencyId::Global(_)) {
let meta = self.interner.function_meta(&id);

if matches!(&meta.function_body, FunctionBody::Unresolved(..)) {
self.elaborate_function(id);
}
}
self.interner.add_function_dependency(current_item, id);
}
}
Expand Down