Skip to content

chore: remove redundant associated constant lookup #9114

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 2 commits into from
Jul 3, 2025
Merged

chore: remove redundant associated constant lookup #9114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d85c9c
chore: remove redundant associated constant lookup
asterite Jul 3, 2025
cb55c87
Use `?`
asterite Jul 3, 2025
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
40 changes: 3 additions & 37 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 @@ -18,14 +18,13 @@ use crate::{
type_check::{Source, TypeCheckError},
},
hir_def::{
expr::{HirExpression, HirIdent, HirLiteral, HirMethodReference, ImplKind, TraitItem},
expr::{HirExpression, HirIdent, HirMethodReference, ImplKind, TraitItem},
stmt::HirPattern,
},
node_interner::{
DefinitionId, DefinitionInfo, DefinitionKind, ExprId, FuncId, GlobalId, TraitImplKind,
TypeAliasId, TypeId,
},
signed_field::SignedField,
};

use super::{
Expand Down Expand Up @@ -680,28 +679,8 @@ impl Elaborator<'_> {

let location = variable.location;
let name = variable.segments[1].ident.as_str();

// Check the `Self::AssociatedConstant` case when inside a trait
if let Some(trait_id) = &self.current_trait {
let trait_ = self.interner.get_trait(*trait_id);
if let Some(associated_type) = trait_.get_associated_type(name) {
if let Kind::Numeric(numeric_type) = associated_type.kind() {
// We can produce any value here because this trait method is never going to
// produce code (only trait impl methods do)
let numeric_type: Type = *numeric_type.clone();
let value = SignedField::zero();
return Some(self.constant_integer(numeric_type, value, location));
}
}
}

let Some(self_type) = &self.self_type else {
return None;
};

let Some(trait_impl_id) = &self.current_trait_impl else {
return None;
};
let self_type = self.self_type.as_ref()?;
let trait_impl_id = &self.current_trait_impl?;

// Check the `Self::AssociatedConstant` case when inside a trait impl
if let Some((definition_id, numeric_type)) =
Expand Down Expand Up @@ -753,19 +732,6 @@ impl Elaborator<'_> {
TypedPathSegment { ident: segment.ident, generics, location: segment.location }
}

fn constant_integer(
&mut self,
numeric_type: Type,
value: SignedField,
location: Location,
) -> (ExprId, Type) {
let hir_expr = HirExpression::Literal(HirLiteral::Integer(value));
let id = self.interner.push_expr(hir_expr);
self.interner.push_expr_location(id, location);
self.interner.push_expr_type(id, numeric_type.clone());
(id, numeric_type)
}

/// Solve any generics that are part of the path before the function, for example:
///
/// ```noir
Expand Down
Loading