Skip to content

chore: early check type equality in try_unify #7263

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

chore: early check type equality in try_unify #7263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e93084
Early check type equality in `try_unify`
asterite Feb 3, 2025
ccf9c99
Avoid evaluating to field elements at the same time
asterite Feb 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
7 changes: 7 additions & 0 deletions compiler/noirc_frontend/src/hir_def/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,6 +1742,13 @@ impl Type {
) -> Result<(), UnificationError> {
use Type::*;

// If the two types are exactly the same then they trivially unify.
// This check avoids potentially unifying very complex types (usually infix
// expressions) when they are the same.
if self == other {
return Ok(());
}

let lhs = self.follow_bindings_shallow();
let rhs = other.follow_bindings_shallow();

Expand Down
15 changes: 9 additions & 6 deletions compiler/noirc_frontend/src/hir_def/types/arithmetic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,15 @@ impl Type {
let dummy_span = Span::default();
// evaluate_to_field_element also calls canonicalize so if we just called
// `self.evaluate_to_field_element(..)` we'd get infinite recursion.
if let (Ok(lhs_value), Ok(rhs_value)) = (
lhs.evaluate_to_field_element_helper(&kind, dummy_span, run_simplifications),
rhs.evaluate_to_field_element_helper(&kind, dummy_span, run_simplifications),
) {
if let Ok(result) = op.function(lhs_value, rhs_value, &kind, dummy_span) {
return Type::Constant(result, kind);
if let Ok(lhs_value) =
lhs.evaluate_to_field_element_helper(&kind, dummy_span, run_simplifications)
{
if let Ok(rhs_value) =
rhs.evaluate_to_field_element_helper(&kind, dummy_span, run_simplifications)
{
if let Ok(result) = op.function(lhs_value, rhs_value, &kind, dummy_span) {
return Type::Constant(result, kind);
}
}
}

Expand Down