language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 15:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

don't clone the defs

Browse source
This commit is contained in:
Folkert 2022-04-23 17:14:02 +02:00
parent 5840693743
commit 002327e275
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@ pub struct Annotation {
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct CanDefs { pub(crate) struct CanDefs {
symbol_to_index: Vec<(IdentId, u32)>, symbol_to_index: Vec<(IdentId, u32)>,
defs: Vec<Def>, defs: Vec<Option<Def>>,
references: Vec<(References, Region)>, references: Vec<(References, Region)>,
aliases: SendMap<Symbol, Alias>, aliases: SendMap<Symbol, Alias>,
@ -527,7 +527,7 @@ pub(crate) fn canonicalize_defs<'a>(
output = temp_output.output; output = temp_output.output;
defs.push(temp_output.def); defs.push(Some(temp_output.def));
references.push((temp_output.references, region)); references.push((temp_output.references, region));
} }
@ -901,7 +901,7 @@ pub(crate) fn sort_can_defs(
) -> (Result<Vec<Declaration>, RuntimeError>, Output) { ) -> (Result<Vec<Declaration>, RuntimeError>, Output) {
let CanDefs { let CanDefs {
symbol_to_index, symbol_to_index,
defs, mut defs,
references, references,
aliases, aliases,
} = defs; } = defs;
@ -920,7 +920,13 @@ pub(crate) fn sort_can_defs(
// groups are in reversed order // groups are in reversed order
for group in groups.into_iter().rev() { for group in groups.into_iter().rev() {
group_to_declaration(&def_ids, &group, &env.closures, &defs, &mut declarations); group_to_declaration(
&def_ids,
&group,
&env.closures,
&mut defs,
&mut declarations,
);
} }
(Ok(declarations), output) (Ok(declarations), output)
@ -978,7 +984,7 @@ pub(crate) fn sort_can_defs(
), ),
Some((_, region)) => { Some((_, region)) => {
let expr_region = let expr_region =
defs.get(*def_id as usize).unwrap().loc_expr.region; defs[*def_id as usize].as_ref().unwrap().loc_expr.region;
let entry = CycleEntry { let entry = CycleEntry {
symbol, symbol,
@ -1056,7 +1062,7 @@ pub(crate) fn sort_can_defs(
&def_ids, &def_ids,
group, group,
&env.closures, &env.closures,
&defs, &mut defs,
&mut declarations, &mut declarations,
); );
} }
@ -1078,7 +1084,7 @@ fn group_to_declaration(
def_ids: &DefOrdering, def_ids: &DefOrdering,
group: &[u32], group: &[u32],
closures: &MutMap<Symbol, References>, closures: &MutMap<Symbol, References>,
defs: &[Def], defs: &mut [Option<Def>],
declarations: &mut Vec<Declaration>, declarations: &mut Vec<Declaration>,
) { ) {
use Declaration::*; use Declaration::*;
@ -1099,7 +1105,7 @@ fn group_to_declaration(
let def_id = cycle[0]; let def_id = cycle[0];
let symbol = def_ids.get_symbol(def_id).unwrap(); let symbol = def_ids.get_symbol(def_id).unwrap();
match defs.get(def_id as usize).cloned() { match defs[def_id as usize].take() {
Some(mut new_def) => { Some(mut new_def) => {
// there is only one definition in this cycle, so we only have // there is only one definition in this cycle, so we only have
// to check whether it recurses with itself; there is nobody else // to check whether it recurses with itself; there is nobody else
@ -1134,7 +1140,7 @@ fn group_to_declaration(
// Topological sort gives us the reverse of the sorting we want! // Topological sort gives us the reverse of the sorting we want!
for def_id in cycle.into_iter().rev() { for def_id in cycle.into_iter().rev() {
let symbol = def_ids.get_symbol(def_id).unwrap(); let symbol = def_ids.get_symbol(def_id).unwrap();
match defs.get(def_id as usize).cloned() { match defs[def_id as usize].take() {
Some(mut new_def) => { Some(mut new_def) => {
// Determine recursivity of closures that are not tail-recursive // Determine recursivity of closures that are not tail-recursive
if let Closure(ClosureData { if let Closure(ClosureData {