language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 13:59:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Compaction of lambda sets must deep copy vars into the right rank

Browse source
This commit is contained in:
Ayaz Hafiz 2022-06-07 10:37:13 -04:00
parent 3dc0793557
commit 90fc08f8df
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/solve/src/solve.rs
View file

@ -553,7 +553,13 @@ fn run_in_place(
let (obligation_problems, _derived) = deferred_obligations.check_all(subs, abilities_store); let (obligation_problems, _derived) = deferred_obligations.check_all(subs, abilities_store);
problems.extend(obligation_problems); problems.extend(obligation_problems);
compact_deferred_lambda_sets(subs, &mut pools, abilities_store, deferred_uls_to_resolve); compact_deferred_lambda_sets(
subs,
&arena,
&mut pools,
abilities_store,
deferred_uls_to_resolve,
);
state.env state.env
} }
@ -1756,6 +1762,7 @@ fn find_specializaton_lambda_sets(
fn compact_deferred_lambda_sets( fn compact_deferred_lambda_sets(
subs: &mut Subs, subs: &mut Subs,
arena: &Bump,
pools: &mut Pools, pools: &mut Pools,
abilities_store: &AbilitiesStore, abilities_store: &AbilitiesStore,
uls_of_var: UlsOfVar, uls_of_var: UlsOfVar,
@ -1768,7 +1775,7 @@ fn compact_deferred_lambda_sets(
continue; continue;
} }
compact_lambda_set(subs, pools, abilities_store, root_lset); compact_lambda_set(subs, arena, pools, abilities_store, root_lset);
seen.insert(root_lset); seen.insert(root_lset);
} }
} }
@ -1776,6 +1783,7 @@ fn compact_deferred_lambda_sets(
fn compact_lambda_set( fn compact_lambda_set(
subs: &mut Subs, subs: &mut Subs,
arena: &Bump,
pools: &mut Pools, pools: &mut Pools,
abilities_store: &AbilitiesStore, abilities_store: &AbilitiesStore,
lambda_set: Variable, lambda_set: Variable,
@ -1785,6 +1793,7 @@ fn compact_lambda_set(
recursion_var, recursion_var,
unspecialized, unspecialized,
} = subs.get_lambda_set(lambda_set); } = subs.get_lambda_set(lambda_set);
let target_rank = subs.get_rank(lambda_set);
if unspecialized.is_empty() { if unspecialized.is_empty() {
return; return;
@ -1839,9 +1848,15 @@ fn compact_lambda_set(
.expect("lambda set region not resolved"), .expect("lambda set region not resolved"),
}; };
compact_lambda_set(subs, pools, abilities_store, specialized_lambda_set); // Ensure the specialization lambda set is already compacted.
compact_lambda_set(subs, arena, pools, abilities_store, specialized_lambda_set);
specialized_to_unify_with.push(specialized_lambda_set); // Ensure the specialization lambda set we'll unify with is not a generalized one, but one
// at the rank of the lambda set being compacted.
let copy_specialized_lambda_set =
deep_copy_var_in(subs, target_rank, pools, specialized_lambda_set, arena);
specialized_to_unify_with.push(copy_specialized_lambda_set);
} }
let new_unspecialized_slice = let new_unspecialized_slice =

7
compiler/solve/tests/solve_expr.rs
View file

@ -6564,8 +6564,7 @@ mod solve_expr {
} }
#[test] #[test]
#[ignore = "First inferred lambda set is incorrect!"] fn resolve_lambda_set_branches_ability_vs_non_ability() {
fn resolve_lambda_set_branches() {
infer_queries( infer_queries(
indoc!( indoc!(
r#" r#"
@ -6578,6 +6577,7 @@ mod solve_expr {
#^^{-1} #^^{-1}
idNotAbility = \x -> x idNotAbility = \x -> x
#^^^^^^^^^^^^{-1}
main = main =
choice : [T, U] choice : [T, U]
@ -6593,7 +6593,8 @@ mod solve_expr {
"# "#
), ),
&[ &[
"A#id(5) : A -[[id(5), idNotAbility(6)]]-> A", "A#id(5) : A -[[id(5)]]-> A",
"idNotAbility : a -[[idNotAbility(6)]]-> a",
"idChoice : a -[[idNotAbility(6)] + a:id(4):1]-> a | a has Id", "idChoice : a -[[idNotAbility(6)] + a:id(4):1]-> a | a has Id",
"idChoice : A -[[id(5), idNotAbility(6)]]-> A", "idChoice : A -[[id(5), idNotAbility(6)]]-> A",
], ],