language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 08:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

be smarter about when a function is recursive

Browse source
This commit is contained in:
Folkert 2022-04-22 14:41:42 +02:00
parent 8c08c63151
commit 887acb7519
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/can/src/def.rs
View file

@ -1634,9 +1634,8 @@ fn group_to_declaration_improved(
// for a definition, so every definition is only inserted (thus typechecked and emitted) once // for a definition, so every definition is only inserted (thus typechecked and emitted) once
let mut seen_pattern_regions: Vec<Region> = Vec::with_capacity(2); let mut seen_pattern_regions: Vec<Region> = Vec::with_capacity(2);
let bitvec = def_ids.references.clone(); let sccs =
strongly_connected_components_improved(def_ids.length as usize, &def_ids.references, group);
let sccs = strongly_connected_components_improved(def_ids.length as usize, &bitvec, group);
for cycle in sccs { for cycle in sccs {
if cycle.len() == 1 { if cycle.len() == 1 {
@ -1645,21 +1644,25 @@ fn group_to_declaration_improved(
match can_defs_by_symbol.remove(&symbol) { match can_defs_by_symbol.remove(&symbol) {
Some(mut new_def) => { Some(mut new_def) => {
// Determine recursivity of closures that are not tail-recursive // there is only one definition in this cycle, so we only have
// to check whether it recurses with itself; there is nobody else
// to recurse with, or they would also be in this cycle.
let is_self_recursive = def_ids.is_self_recursive(def_id);
if let Closure(ClosureData { if let Closure(ClosureData {
recursive: recursive @ Recursive::NotRecursive, recursive: recursive @ Recursive::NotRecursive,
.. ..
}) = &mut new_def.loc_expr.value }) = &mut new_def.loc_expr.value
{ {
*recursive = closure_recursivity(symbol, closures); if is_self_recursive {
*recursive = Recursive::Recursive
}
} }
let is_recursive = def_ids.is_self_recursive(def_id);
if !seen_pattern_regions.contains(&new_def.loc_pattern.region) { if !seen_pattern_regions.contains(&new_def.loc_pattern.region) {
seen_pattern_regions.push(new_def.loc_pattern.region); seen_pattern_regions.push(new_def.loc_pattern.region);
if is_recursive { if is_self_recursive {
declarations.push(DeclareRec(vec![new_def])); declarations.push(DeclareRec(vec![new_def]));
} else { } else {
declarations.push(Declare(new_def)); declarations.push(Declare(new_def));