language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

refactor

Browse source
This commit is contained in:
Folkert 2023-06-28 22:08:47 +02:00
parent f27cb83a02
commit b29e612a4d
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/compiler/mono/src/reset_reuse.rs
View file

@ -9,8 +9,8 @@ use std::hash::Hash;
use crate::borrow::Ownership; use crate::borrow::Ownership;
use crate::ir::{ use crate::ir::{
BranchInfo, Expr, JoinPointId, ModifyRc, Param, Proc, ProcLayout, Stmt, UpdateModeId, BranchInfo, Expr, JoinPointId, ModifyRc, Param, Proc, ProcLayout, ReuseToken, Stmt,
UpdateModeIds, UpdateModeId, UpdateModeIds,
}; };
use crate::layout::{InLayout, LayoutInterner, LayoutRepr, STLayoutInterner, UnionLayout}; use crate::layout::{InLayout, LayoutInterner, LayoutRepr, STLayoutInterner, UnionLayout};
@ -153,16 +153,9 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
)) { )) {
// We have a reuse token for this layout, use it. // We have a reuse token for this layout, use it.
Some(TokenWithInLayout { Some(TokenWithInLayout {
token: reuse_token, token: mut reuse_token,
inlayout: layout_info, inlayout: layout_info,
}) => { }) => {
let reuse_token = crate::ir::ReuseToken {
symbol: reuse_token.symbol,
update_mode: reuse_token.update_mode_id,
// for now, always overwrite the tag ID just to be sure
update_tag_id: true,
};
if layout_info == layout { if layout_info == layout {
// The reuse token layout is the same, we can use it without casting. // The reuse token layout is the same, we can use it without casting.
( (
@ -188,12 +181,8 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
)) ))
}; };
let reuse_token = crate::ir::ReuseToken { // we now want to reuse the cast pointer
symbol: new_symbol, reuse_token.symbol = new_symbol;
update_mode: reuse_token.update_mode,
// for now, always overwrite the tag ID just to be sure
update_tag_id: true,
};
( (
Some(ptr_cast), Some(ptr_cast),
@ -491,7 +480,9 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
let reuse_token = ReuseToken { let reuse_token = ReuseToken {
symbol: reuse_symbol, symbol: reuse_symbol,
update_mode_id: update_mode_ids.next_id(), update_mode: update_mode_ids.next_id(),
// for now, always overwrite the tag ID just to be sure
update_tag_id: true,
}; };
let owned_layout = **layout; let owned_layout = **layout;
@ -553,7 +544,7 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
// a dec will be replaced by a reset. // a dec will be replaced by a reset.
let reset_expr = Expr::Reset { let reset_expr = Expr::Reset {
symbol, symbol,
update_mode: reuse_token.update_mode_id, update_mode: reuse_token.update_mode,
}; };
return arena.alloc(Stmt::Let( return arena.alloc(Stmt::Let(
@ -567,7 +558,7 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
// a decref will be replaced by a resetref. // a decref will be replaced by a resetref.
let reset_expr = Expr::ResetRef { let reset_expr = Expr::ResetRef {
symbol, symbol,
update_mode: reuse_token.update_mode_id, update_mode: reuse_token.update_mode,
}; };
return arena.alloc(Stmt::Let( return arena.alloc(Stmt::Let(
@ -753,7 +744,9 @@ fn insert_reset_reuse_operations_stmt<'a, 'i>(
tokens.iter().map(|token| TokenWithInLayout { tokens.iter().map(|token| TokenWithInLayout {
token: ReuseToken { token: ReuseToken {
symbol: Symbol::new(home, ident_ids.gen_unique()), symbol: Symbol::new(home, ident_ids.gen_unique()),
update_mode_id: update_mode_ids.next_id(), update_mode: update_mode_ids.next_id(),
// for now, always overwrite the tag ID just to be sure
update_tag_id: true,
}, },
inlayout: token.inlayout, inlayout: token.inlayout,
}), }),
@ -1140,19 +1133,6 @@ struct TokenLayout {
alignment: u32, alignment: u32,
} }
/**
A reuse token is a symbol that is used to reset a layout.
Matches symbols that are pointers.
*/
#[derive(Clone, Copy, PartialEq, Eq)]
struct ReuseToken {
// The symbol of the reuse token.
symbol: Symbol,
// Index that can be used later to determine if in place mutation is possible.
update_mode_id: UpdateModeId,
}
/** /**
Combines a reuse token with it's possible layout info. Combines a reuse token with it's possible layout info.
*/ */