roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-22 08:17:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Coalesce instantiated type indices

Browse Source
This commit is contained in:
Ayaz Hafiz 2022-11-09 10:26:54 -06:00
parent 764cc4d1d8
commit 8107c30a4b
No known key found for this signature in database
GPG Key ID: 0E2A37416A25EF58
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/compiler/constrain/src/expr.rs
View File

@ -3144,6 +3144,7 @@ fn instantiate_rigids(
if !rigid_substitution.is_empty() {
annotation.substitute_variables(&rigid_substitution);
}
let annotation_index = types.from_old_type(&annotation);
// TODO investigate when we can skip this. It seems to only be required for correctness
// for recursive functions. For non-recursive functions the final type is correct, but
@ -3152,10 +3153,7 @@ fn instantiate_rigids(
// Skipping all of this cloning here would be neat!
let loc_annotation_ref = Loc::at(loc_pattern.region, &annotation);
if let Pattern::Identifier(symbol) = loc_pattern.value {
let annotation_index = {
let typ = types.from_old_type(&annotation);
constraints.push_type(types, typ)
};
let annotation_index = constraints.push_type(types, annotation_index);
headers.insert(symbol, Loc::at(loc_pattern.region, annotation_index));
} else if let Some(new_headers) = crate::pattern::headers_from_annotation(
types,
@ -3167,8 +3165,7 @@ fn instantiate_rigids(
}
InstantiateRigids {
// TODO(types-soa) coalesce with types.from_old_type(annotation) above
signature: types.from_old_type(&annotation),
signature: annotation_index,
new_rigid_variables,
new_infer_variables,
}