Skip to content

Cross-module recursive_type_set import-merge fix (04_infer.dag:5422/5551): imported alias names mis-enter the consumer recursive_type_set -> spurious Box on concrete imported-alias fields (BROAD §3 emit/inference correctness, measure the most-visible instance). GATES: design-checkpoint to parent bef #5642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
briansrls wants to merge 1 commit into from
Closed

Cross-module recursive_type_set import-merge fix (04_infer.dag:5422/5551): imported alias names mis-enter the consumer recursive_type_set -> spurious Box on concrete imported-alias fields (BROAD §3 emit/inference correctness, measure the most-visible instance). GATES: design-checkpoint to parent bef #5642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/v1/04_infer.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5483,10 +5483,10 @@ fn build_type_env(module: ResolvedModule, parent_index: Map<String, TypedModule>
map_insert(acc, b.name, node_type_deps(n: b.resolved, source_indices: source_indices))
)

let str_bindings = fold(merged.bindings |> map_values, init: empty_map(), f: (acc, b) =>
let local_str_bindings = fold(pre_local_env.bindings |> map_values, init: empty_map(), f: (acc, b) =>
map_insert(acc, b.name, b)
)
let cycle_set_str = detect_type_cycles_kahn(deps_map: all_deps_map, bindings: str_bindings)
let cycle_set_str = detect_type_cycles_kahn(deps_map: all_deps_map, bindings: local_str_bindings)
let cycle_set = cycle_set_str |> map(name => intern(table: intern_table, s: name).id)
let cross_type_all_names = concat(cycle_set_str, map_keys(compiler_recursive_types))
let cross_type_set_str = fold(cross_type_all_names, init: empty_set(), f: (acc, name) => set_insert(acc, name))
Expand Down Expand Up @@ -5575,10 +5575,10 @@ fn build_type_env_unresolved(module: ResolvedModule, parent_index: Map<String, T
map_insert(acc, b.name, node_type_deps(n: b.resolved, source_indices: source_indices))
)

let str_bindings = fold(merged.bindings |> map_values, init: empty_map(), f: (acc, b) =>
let local_str_bindings = fold(pre_local_env.bindings |> map_values, init: empty_map(), f: (acc, b) =>
map_insert(acc, b.name, b)
)
let cycle_set_str = detect_type_cycles_kahn(deps_map: all_deps_map, bindings: str_bindings)
let cycle_set_str = detect_type_cycles_kahn(deps_map: all_deps_map, bindings: local_str_bindings)
let cycle_set = cycle_set_str |> map(name => intern(table: intern_table, s: name).id)
let cross_type_all_names = concat(cycle_set_str, map_keys(compiler_recursive_types))
let cross_type_set_str = fold(cross_type_all_names, init: empty_set(), f: (acc, name) => set_insert(acc, name))
Expand Down
6 changes: 3 additions & 3 deletions src/v1/stage0/src/v1_compiler_infer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12104,7 +12104,7 @@ pub fn build_type_env(
)
},
);
let str_bindings = Rc::new(v1_rt::map_values(&merged.bindings.clone()))
let local_str_bindings = Rc::new(v1_rt::map_values(&pre_local_env.bindings.clone()))
.iter()
.cloned()
.fold(
Expand All @@ -12113,7 +12113,7 @@ pub fn build_type_env(
v1_rt::rc_map_insert(acc, b.name.clone(), b.clone())
},
);
let cycle_set_str = detect_type_cycles_kahn(all_deps_map.clone(), str_bindings);
let cycle_set_str = detect_type_cycles_kahn(all_deps_map.clone(), local_str_bindings);
let cycle_set = Rc::new({
let mut __result = Vec::new();
for name in cycle_set_str.clone().iter().cloned() {
Expand Down Expand Up @@ -12572,7 +12572,7 @@ pub fn build_type_env_unresolved(
)
},
);
let str_bindings = Rc::new(v1_rt::map_values(&merged.bindings.clone()))
let local_str_bindings = Rc::new(v1_rt::map_values(&pre_local_env.bindings.clone()))
.iter()
.cloned()
.fold(
Expand Down
Loading