language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-23 14:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix types SoA usage in solve

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-09 09:11:56 -06:00
parent 6b5f632364
commit a2e90c3709
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
6 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/compiler/solve/src/ability.rs
View file

@ -75,6 +75,7 @@ impl PendingDerivesTable {
let derive_key = RequestedDeriveKey { opaque, ability };
// Neither rank nor pools should matter here.
let typ = types.from_old_type(&typ);
let opaque_var = type_to_var(
subs,
Rank::toplevel(),
@ -84,7 +85,7 @@ impl PendingDerivesTable {
&mut Pools::default(),
types,
aliases,
&typ,
typ,
);
let real_var = match subs.get_content_without_compacting(opaque_var) {
Content::Alias(_, _, real_var, AliasKind::Opaque) => real_var,

22
crates/compiler/solve/src/solve.rs
View file

@ -1347,10 +1347,10 @@ fn solve(
.map(|v| Type::Variable(*v))
.collect();
let tag_ty = Type::TagUnion(
let tag_ty = can_types.from_old_type(&Type::TagUnion(
vec![(tag_name.clone(), payload_types)],
TypeExtension::Closed,
);
));
let includes = type_to_var(
subs,
rank,
@ -1360,7 +1360,7 @@ fn solve(
pools,
&mut can_types,
aliases,
&tag_ty,
tag_ty,
);
match unify(
@ -2265,7 +2265,7 @@ fn type_cell_to_var(
aliases: &mut Aliases,
typ_cell: &Cell<Index<TypeTag>>,
) -> Variable {
let typ = typ_cell.replace(Type::EmptyTagUnion);
let typ = typ_cell.get();
let var = type_to_var(
subs,
rank,
@ -2275,9 +2275,12 @@ fn type_cell_to_var(
pools,
types,
aliases,
&typ,
typ,
);
typ_cell.replace(Type::Variable(var));
unsafe {
types.set_variable(typ, var);
}
var
}
@ -2290,13 +2293,12 @@ pub(crate) fn type_to_var(
pools: &mut Pools,
types: &mut Types,
aliases: &mut Aliases,
typ: &Type,
typ: Index<TypeTag>,
) -> Variable {
if let Type::Variable(var) = typ {
*var
if let TypeTag::Variable(var) = types[typ] {
var
} else {
let mut arena = take_scratchpad();
let typ = types.from_old_type(typ);
let var = type_to_variable(
subs,