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

used resulting incremented_symbols

Browse source
This commit is contained in:
J.Teeuwissen 2023-05-29 17:21:36 +02:00 • committed by Folkert
parent 94fb89bde4
commit d735742fdb
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
3 changed files with 66 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/compiler/mono/src/drop_specialization.rs
View file

@ -677,7 +677,7 @@ fn specialize_drops_stmt<'a, 'i>(
let mut body_jump_incremented_symbols = remainder_jump_incremented_symbols;
// Perform iteration to get the incremented_symbols for the body.
let joinpoint_usage = loop {
let joinpoint_info = loop {
// Update the incremented_symbols to the remainder's incremented_symbols.
let mut current_body_environment = body_environment.clone();
current_body_environment.incremented_symbols =
@ -701,18 +701,21 @@ fn specialize_drops_stmt<'a, 'i>(
.clone();
if body_jump_incremented_symbols == new_body_jump_incremented_symbols {
break new_body_jump_incremented_symbols;
break (
new_body_jump_incremented_symbols,
current_body_environment.incremented_symbols,
);
} else {
body_jump_incremented_symbols = new_body_jump_incremented_symbols;
}
};
let join_joinpoint_usage = arena.alloc(joinpoint_usage.clone());
let alloced_joinpoint_info = arena.alloc(joinpoint_info.clone());
body_environment.incremented_symbols = joinpoint_usage;
body_environment.incremented_symbols = joinpoint_info.0;
body_environment
.join_incremented_symbols
.insert(*id, join_joinpoint_usage);
.insert(*id, alloced_joinpoint_info);
let new_body = specialize_drops_stmt(
arena,
@ -724,7 +727,7 @@ fn specialize_drops_stmt<'a, 'i>(
environment
.join_incremented_symbols
.insert(*id, join_joinpoint_usage);
.insert(*id, alloced_joinpoint_info);
arena.alloc(Stmt::Join {
id: *id,
@ -741,7 +744,7 @@ fn specialize_drops_stmt<'a, 'i>(
}
Stmt::Jump(joinpoint_id, arguments) => {
match environment.join_incremented_symbols.get(joinpoint_id) {
Some(join_usage) => {
Some((join_usage, join_returns)) => {
// Consume all symbols that were consumed in the join.
for (symbol, count) in join_usage.map.iter() {
for _ in 0..*count {
@ -752,6 +755,11 @@ fn specialize_drops_stmt<'a, 'i>(
);
}
}
for (symbol, count) in join_returns.map.iter() {
environment
.incremented_symbols
.insert_count(*symbol, *count);
}
}
None => {
// No join usage, let the join know the minimum amount of symbols that were incremented from each jump.
@ -1411,7 +1419,7 @@ struct DropSpecializationEnvironment<'a> {
jump_incremented_symbols: MutMap<JoinPointId, CountingMap<Symbol>>,
// A map containing the expected number of symbol increments from joinpoints for a jump.
join_incremented_symbols: MutMap<JoinPointId, &'a CountingMap<Symbol>>,
join_incremented_symbols: MutMap<JoinPointId, &'a (CountingMap<Symbol>, CountingMap<Symbol>)>,
}
impl<'a> DropSpecializationEnvironment<'a> {