Skip to content

fix: Replace panic in monomorphization with an error #5305

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 21, 2024
Merged

fix: Replace panic in monomorphization with an error #5305

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
3 changes: 3 additions & 0 deletions compiler/noirc_frontend/src/monomorphization/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ use crate::hir::comptime::InterpreterError;
pub enum MonomorphizationError {
UnknownArrayLength { location: Location },
TypeAnnotationsNeeded { location: Location },
InternalError { message: &'static str, location: Location },
InterpreterError(InterpreterError),
}

impl MonomorphizationError {
fn location(&self) -> Location {
match self {
MonomorphizationError::UnknownArrayLength { location }
| MonomorphizationError::InternalError { location, .. }
| MonomorphizationError::TypeAnnotationsNeeded { location } => *location,
MonomorphizationError::InterpreterError(error) => error.get_location(),
}
Expand All @@ -36,6 +38,7 @@ impl MonomorphizationError {
}
MonomorphizationError::TypeAnnotationsNeeded { .. } => "Type annotations needed",
MonomorphizationError::InterpreterError(error) => return (&error).into(),
MonomorphizationError::InternalError { message, .. } => message,
};

let location = self.location();
Expand Down
6 changes: 5 additions & 1 deletion compiler/noirc_frontend/src/monomorphization/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,11 @@ impl<'interner> Monomorphizer<'interner> {
DefinitionKind::Local(_) => match self.lookup_captured_expr(ident.id) {
Some(expr) => expr,
None => {
let ident = self.local_ident(&ident)?.unwrap();
let Some(ident) = self.local_ident(&ident)? else {
let location = self.interner.id_location(expr_id);
let message = "ICE: Variable not found during monomorphization";
return Err(MonomorphizationError::InternalError { location, message });
};
ast::Expression::Ident(ident)
}
},
Expand Down