Skip to content

Commit

Permalink
wip debugging propagation of N?
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaeljklein
michaeljklein committed Feb 19, 2024
1 parent 7f3ee9c commit c3b67aa
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 27 deletions.
6 changes: 4 additions & 2 deletions compiler/noirc_frontend/src/hir/resolution/resolver.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,9 @@ impl<'a> Resolver<'a> {
Array(size, elem) => {
let elem = Box::new(self.resolve_type_inner(*elem, new_variables));
let size = if size.is_none() {
Type::NotConstant
println!("TODO: Array NotConstant Size");

Type::NotConstant(false)
} else {
self.resolve_array_size(size, new_variables)
};
Expand Down Expand Up @@ -1106,7 +1108,7 @@ impl<'a> Resolver<'a> {
| Type::TypeVariable(_, _)
| Type::Constant(_)
| Type::NamedGeneric(_, _, _)
| Type::NotConstant
| Type::NotConstant(_)
| Type::TraitAsType(..)
| Type::Forall(_, _) => (),

Expand Down
2 changes: 2 additions & 0 deletions compiler/noirc_frontend/src/hir/type_check/expr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ impl<'interner> TypeChecker<'interner> {
let elem_type = self.check_expression(&repeated_element);
let length = match length {
Type::Constant(length) => {
println!("Type::Constant({length}): {:?}", repeated_element);

Type::constant_variable(length, self.interner)
}
other => other,
Expand Down
56 changes: 36 additions & 20 deletions compiler/noirc_frontend/src/hir_def/types.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ pub enum Type {
/// The type of a slice is an array of size NotConstant.
/// The size of an array literal is resolved to this if it ever uses operations
/// involving slices.
NotConstant,
///
/// prevent_numeric: bool (prevent binding to a Constant(_))
NotConstant(bool),

/// The result of some type error. Remembering type errors as their own type variant lets
/// us avoid issuing repeat type errors for the same item. For example, a lambda with
Expand Down Expand Up @@ -154,15 +156,15 @@ impl Type {
| Type::MutableReference(_)
| Type::Forall(_, _)
| Type::Constant(_)
| Type::NotConstant
| Type::NotConstant(_)
| Type::Error => unreachable!("This type cannot exist as a parameter to main"),
}
}

pub(crate) fn is_nested_slice(&self) -> bool {
match self {
Type::Array(size, elem) => {
if let Type::NotConstant = size.as_ref() {
if let Type::NotConstant(_) = size.as_ref() {
elem.as_ref().contains_slice()
} else {
false
Expand All @@ -174,7 +176,7 @@ impl Type {

pub(crate) fn contains_slice(&self) -> bool {
match self {
Type::Array(size, _) => matches!(size.as_ref(), Type::NotConstant),
Type::Array(size, _) => matches!(size.as_ref(), Type::NotConstant(_)),
Type::Struct(struct_typ, generics) => {
let fields = struct_typ.borrow().get_fields(generics);
for field in fields.iter() {
Expand Down Expand Up @@ -638,7 +640,7 @@ impl Type {
| Type::TypeVariable(_, _)
| Type::Constant(_)
| Type::NamedGeneric(_, _, _)
| Type::NotConstant
| Type::NotConstant(_)
| Type::Forall(_, _)
| Type::TraitAsType(..) => false,

Expand Down Expand Up @@ -704,7 +706,7 @@ impl Type {
| Type::MutableReference(_)
| Type::Forall(_, _)
| Type::TraitAsType(..)
| Type::NotConstant => false,
| Type::NotConstant(_) => false,

// This function is called during name resolution before we've verified aliases
// are not cyclic. As a result, it wouldn't be safe to check this alias' definition
Expand Down Expand Up @@ -773,7 +775,7 @@ impl std::fmt::Display for Type {
write!(f, "Field")
}
Type::Array(len, typ) => {
if matches!(len.follow_bindings(), Type::NotConstant) {
if matches!(len.follow_bindings(), Type::NotConstant(_)) {
write!(f, "[{typ}]")
} else {
write!(f, "[{typ}; {len}]")
Expand Down Expand Up @@ -872,7 +874,7 @@ impl std::fmt::Display for Type {
Type::MutableReference(element) => {
write!(f, "&mut {element}")
}
Type::NotConstant => write!(f, "_"),
Type::NotConstant(_) => write!(f, "_"),
}
}
}
Expand Down Expand Up @@ -921,16 +923,22 @@ impl Type {
TypeBinding::Unbound(id) => *id,
};

println!("try_bind_to_maybe_constant: {:?} {:?} {:?} {:?}", self, var, target_length, bindings);

let this = self.substitute(bindings).follow_bindings();

match &this {
Type::Constant(length) if *length == target_length => {
bindings.insert(target_id, (var.clone(), this));
Ok(())
}
Type::NotConstant => {
bindings.insert(target_id, (var.clone(), Type::NotConstant));
Ok(())
Type::NotConstant(prevent_numeric) => {
if *prevent_numeric {
Err(UnificationError)
} else {
bindings.insert(target_id, (var.clone(), Type::NotConstant(*prevent_numeric)));
Ok(())
}
}
// A TypeVariable is less specific than a MaybeConstant, so we bind
// to the other type variable instead.
Expand Down Expand Up @@ -963,8 +971,8 @@ impl Type {
// just set them both to NotConstant. See issue 2370
TypeVariableKind::Constant(_) => {
// *length != target_length
bindings.insert(target_id, (var.clone(), Type::NotConstant));
bindings.insert(*new_target_id, (new_var.clone(), Type::NotConstant));
bindings.insert(target_id, (var.clone(), Type::NotConstant(false)));
bindings.insert(*new_target_id, (new_var.clone(), Type::NotConstant(false)));
Ok(())
}
TypeVariableKind::IntegerOrField => Err(UnificationError),
Expand Down Expand Up @@ -1164,6 +1172,8 @@ impl Type {
(TypeVariable(var, Kind::Constant(length)), other)
| (other, TypeVariable(var, Kind::Constant(length))) => other
.try_unify_to_type_variable(var, bindings, |bindings| {
println!("PRE try_bind_to_maybe_constant: {:?} {:?} {:?}", var, length, other);

other.try_bind_to_maybe_constant(var, *length, bindings)
}),

Expand Down Expand Up @@ -1208,6 +1218,10 @@ impl Type {
if !binding.borrow().is_unbound() =>
{
if let TypeBinding::Bound(link) = &*binding.borrow() {
// println!("try_unify NamedGeneric: {:?} {:?} {:?} {:?}", self, other, bindings, link);
// other.typ.contains_numeric_typevar(target_id)


link.try_unify(other, bindings)
} else {
unreachable!("If guard ensures binding is bound")
Expand Down Expand Up @@ -1265,6 +1279,8 @@ impl Type {
// bind to the given type or not.
bind_variable: impl FnOnce(&mut TypeBindings) -> Result<(), UnificationError>,
) -> Result<(), UnificationError> {
println!("try_unify_to_type_variable: {:?} {:?}", type_variable, bindings);

match &*type_variable.borrow() {
// If it is already bound, unify against what it is bound to
TypeBinding::Bound(link) => link.try_unify(self, bindings),
Expand Down Expand Up @@ -1321,7 +1337,7 @@ impl Type {
let size2 = size2.follow_bindings();

// If we have an array and our target is a slice
if matches!(size1, Type::Constant(_)) && matches!(size2, Type::NotConstant) {
if matches!(size1, Type::Constant(_)) && matches!(size2, Type::NotConstant(_)) {
// Still have to ensure the element types match.
// Don't need to issue an error here if not, it will be done in unify_with_coercions
let mut bindings = TypeBindings::new();
Expand Down Expand Up @@ -1556,7 +1572,7 @@ impl Type {
| Type::Constant(_)
| Type::TraitAsType(..)
| Type::Error
| Type::NotConstant
| Type::NotConstant(_)
| Type::Unit => self.clone(),
}
}
Expand Down Expand Up @@ -1597,7 +1613,7 @@ impl Type {
| Type::Constant(_)
| Type::TraitAsType(..)
| Type::Error
| Type::NotConstant
| Type::NotConstant(_)
| Type::Unit => false,
}
}
Expand Down Expand Up @@ -1655,7 +1671,7 @@ impl Type {
| Constant(_)
| Unit
| Error
| NotConstant => self.clone(),
| NotConstant(_) => self.clone(),
}
}

Expand Down Expand Up @@ -1778,7 +1794,7 @@ impl From<&Type> for PrintableType {
Type::MutableReference(typ) => {
PrintableType::MutableReference { typ: Box::new(typ.as_ref().into()) }
}
Type::NotConstant => unreachable!(),
Type::NotConstant(_) => unreachable!(),
}
}
}
Expand All @@ -1790,7 +1806,7 @@ impl std::fmt::Debug for Type {
write!(f, "Field")
}
Type::Array(len, typ) => {
if matches!(len.follow_bindings(), Type::NotConstant) {
if matches!(len.follow_bindings(), Type::NotConstant(_)) {
write!(f, "[{typ:?}]")
} else {
write!(f, "[{typ:?}; {len:?}]")
Expand Down Expand Up @@ -1867,7 +1883,7 @@ impl std::fmt::Debug for Type {
Type::MutableReference(element) => {
write!(f, "&mut {element:?}")
}
Type::NotConstant => write!(f, "NotConstant"),
Type::NotConstant(prevent_numeric) => write!(f, "NotConstant({})", prevent_numeric),
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions compiler/noirc_frontend/src/monomorphization/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ impl<'interner> Monomorphizer<'interner> {

HirType::Forall(_, _)
| HirType::Constant(_)
| HirType::NotConstant
| HirType::NotConstant(_)
| HirType::Error => {
unreachable!("Unexpected type {} found", typ)
}
Expand Down Expand Up @@ -1074,7 +1074,7 @@ impl<'interner> Monomorphizer<'interner> {
// Disallow printing slices and mutable references for consistency,
// since they cannot be passed from ACIR into Brillig
if let HirType::Array(size, _) = typ {
if let HirType::NotConstant = **size {
if let HirType::NotConstant(_) = **size {
unreachable!("println and format strings do not support slices. Convert the slice to an array before passing it to println");
}
} else if matches!(typ, HirType::MutableReference(_)) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/noirc_frontend/src/node_interner.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,7 @@ fn get_type_method_key(typ: &Type) -> Option<TypeMethodKey> {
| Type::Forall(_, _)
| Type::Constant(_)
| Type::Error
| Type::NotConstant
| Type::NotConstant(_)
| Type::Struct(_, _)
| Type::TraitAsType(..) => None,
}
Expand Down
2 changes: 1 addition & 1 deletion test_programs/compile_success_empty/array_slice_polymorphism/src/main.nr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fn array_zeros<N?>(_x: [u64; N]) -> [u64; N] {
}

fn main(x: Field, y: pub Field) {
let xs: [u64] = [0; 0];
let xs: [u64] = [11111; 1337];
assert(array_zeros(xs) == xs);
assert(x != y);
}
Expand Down
2 changes: 1 addition & 1 deletion tooling/noirc_abi/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ impl AbiType {
| Type::TypeVariable(_, _)
| Type::NamedGeneric(..)
| Type::Forall(..)
| Type::NotConstant
| Type::NotConstant(_)
| Type::Function(_, _, _) => unreachable!("Type cannot be used in the abi"),
Type::FmtString(_, _) => unreachable!("format strings cannot be used in the abi"),
Type::MutableReference(_) => unreachable!("&mut cannot be used in the abi"),
Expand Down

0 comments on commit c3b67aa

Please sign in to comment.