language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 04:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Correctly copy non-generalized imports as non-generalized

Browse source 
Importing a rigid variable in a non-generalized context should not keep
the variable as rigid. That's because rigid variables are only necessary
for enforcing invariants during typechecking of a generalizable
definition, but at all use sites (which are not generalized), they are
demoted to possibly-unbound type variable.
This commit is contained in:
Ayaz Hafiz 2023-05-24 14:12:05 -05:00
parent d3120e500e
commit 9f45c2ff47
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/compiler/types/src/subs.rs
View file

@ -5663,8 +5663,18 @@ fn copy_import_to_help(env: &mut CopyImportEnv<'_>, max_rank: Rank, var: Variabl
let name = env.source.field_names[name_index.index as usize].clone();
let new_name_index = SubsIndex::push_new(&mut env.target.field_names, name);
env.target
.set(copy, make_descriptor(RigidVar(new_name_index)));
// If we are copying the import as generalized, we can keep it as rigid.
// Otherwise we must make it flex, as this is copying to a non-generalized site.
//
// The rigid distinction is never necessary for imports, since their types have already
// been checked completely.
let content = if max_rank.is_generalized() {
RigidVar(new_name_index)
} else {
FlexVar(Some(new_name_index))
};
env.target.set(copy, make_descriptor(content));
env.rigid.push(copy);
@ -5680,10 +5690,18 @@ fn copy_import_to_help(env: &mut CopyImportEnv<'_>, max_rank: Rank, var: Variabl
env.source.get_subs_slice(abilities).iter().copied(),
);
env.target.set(
copy,
make_descriptor(RigidAbleVar(new_name_index, new_abilities)),
);
// If we are copying the import as generalized, we can keep it as rigid.
// Otherwise we must make it flex, as this is copying to a non-generalized site.
//
// The rigid distinction is never necessary for imports, since their types have already
// been checked completely.
let content = if max_rank.is_generalized() {
RigidAbleVar(new_name_index, new_abilities)
} else {
FlexAbleVar(Some(new_name_index), new_abilities)
};
env.target.set(copy, make_descriptor(content));
env.rigid_able.push(copy);