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

Fix bug in unifying records

Browse source 
This was leading us to have an infinitely-recursive type, which eventually causes layout to stack-overflow

Fixes #4739
This commit is contained in:
Joshua Warner 2022-12-15 19:12:12 -08:00
parent faaa466c70
commit 174f7d5e4d
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
5 changed files with 191 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/compiler/unify/src/unify.rs
View file

@ -2055,33 +2055,41 @@ fn unify_shared_fields<M: MetaCollector>(
// this is an error, but we continue to give better error messages
continue;
}
(Demanded(val), Required(_))
| (Required(val), Demanded(_))
| (Demanded(val), Demanded(_)) => Demanded(val),
(Required(val), Required(_)) => Required(val),
(Required(val), Optional(_)) => Required(val),
(Optional(val), Required(_)) => Required(val),
(Optional(val), Optional(_)) => Optional(val),
(Demanded(a), Required(b))
| (Required(a), Demanded(b))
| (Demanded(a), Demanded(b)) => Demanded(choose_merged_var(env.subs, a, b)),
(Required(a), Required(b))
| (Required(a), Optional(b))
| (Optional(a), Required(b)) => Required(choose_merged_var(env.subs, a, b)),
(Optional(a), Optional(b)) => Optional(choose_merged_var(env.subs, a, b)),
// rigid optional
(RigidOptional(val), Optional(_)) | (Optional(_), RigidOptional(val)) => {
RigidOptional(val)
(RigidOptional(a), Optional(b)) | (Optional(b), RigidOptional(a)) => {
RigidOptional(choose_merged_var(env.subs, a, b))
}
(RigidOptional(a), RigidOptional(b)) => {
RigidOptional(choose_merged_var(env.subs, a, b))
}
(RigidOptional(_), Demanded(_) | Required(_) | RigidRequired(_))
| (Demanded(_) | Required(_) | RigidRequired(_), RigidOptional(_)) => {
// this is an error, but we continue to give better error messages
continue;
}
(RigidOptional(val), RigidOptional(_)) => RigidOptional(val),
// rigid required
(RigidRequired(_), Optional(_)) | (Optional(_), RigidRequired(_)) => {
// this is an error, but we continue to give better error messages
continue;
}
(RigidRequired(val), Demanded(_) | Required(_))
| (Demanded(_) | Required(_), RigidRequired(val)) => RigidRequired(val),
(RigidRequired(val), RigidRequired(_)) => RigidRequired(val),
(RigidRequired(a), Demanded(b) | Required(b))
| (Demanded(b) | Required(b), RigidRequired(a)) => {
RigidRequired(choose_merged_var(env.subs, a, b))
}
(RigidRequired(a), RigidRequired(b)) => {
RigidRequired(choose_merged_var(env.subs, a, b))
}
};
matching_fields.push((name, actual));