Skip to content
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

fix: Avoid asserting in typechecker if struct field count is not correct #1036

Merged
merged 1 commit into from
Mar 27, 2023
Merged

fix: Avoid asserting in typechecker if struct field count is not correct #1036

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
26 changes: 13 additions & 13 deletions crates/noirc_frontend/src/hir/type_check/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,6 @@ fn check_constructor(
let typ = constructor.r#type;
let generics = constructor.struct_generics;

// Sanity check, this should be caught during name resolution anyway
assert_eq!(constructor.fields.len(), typ.borrow().num_fields());

// Sort argument types by name so we can zip with the struct type in the same ordering.
// Note that we use a Vec to store the original arguments (rather than a BTreeMap) to
// preserve the evaluation order of the source code.
Expand All @@ -685,17 +682,20 @@ fn check_constructor(
let fields = typ.borrow().get_fields(&generics);

for ((param_name, param_type), (arg_ident, arg)) in fields.into_iter().zip(args) {
// Sanity check to ensure we're matching against the same field
assert_eq!(param_name, arg_ident.0.contents);

let arg_type = type_check_expression(interner, &arg, errors);
// This can be false if the user provided an incorrect field count. That error should
// be caught during name resolution so it is fine to skip typechecking if there is a
// mismatch here as long as we continue typechecking the rest of the program to the best
// of our ability.
if param_name == arg_ident.0.contents {
let arg_type = type_check_expression(interner, &arg, errors);

let span = interner.expr_span(expr_id);
arg_type.make_subtype_of(&param_type, span, errors, || TypeCheckError::TypeMismatch {
expected_typ: param_type.to_string(),
expr_typ: arg_type.to_string(),
expr_span: span,
});
let span = interner.expr_span(expr_id);
arg_type.make_subtype_of(&param_type, span, errors, || TypeCheckError::TypeMismatch {
expected_typ: param_type.to_string(),
expr_typ: arg_type.to_string(),
expr_span: span,
});
}
}

Type::Struct(typ, generics)
Expand Down