language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Added traits and updated remaining borrowed

Browse source
This commit is contained in:
J.Teeuwissen 2023-01-05 12:02:20 +01:00
parent 09f9df1f40
commit 1f10d0cb92
No known key found for this signature in database
GPG key ID: DB5F7A1ED8D478AD
3 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/compiler/mono/src/inc_dec.rs
View file

@ -61,13 +61,13 @@ impl DataFunction {
use DataFunction::*;
let data_borrowed = !vars[&lowlevel_argument].consume;
let function_borrows = passed_function_argument.borrow;
let function_ownership = passed_function_argument.ownership;
match (data_borrowed, function_borrows) {
(BORROWED, BORROWED) => DataBorrowedFunctionBorrows,
(BORROWED, OWNED) => DataBorrowedFunctionOwns,
(OWNED, BORROWED) => DataOwnedFunctionBorrows,
(OWNED, OWNED) => DataOwnedFunctionOwns,
match (data_borrowed, function_ownership) {
(BORROWED, Ownership::Borrowed) => DataBorrowedFunctionBorrows,
(BORROWED, Ownership::Owned) => DataBorrowedFunctionOwns,
(OWNED, Ownership::Borrowed) => DataOwnedFunctionBorrows,
(OWNED, Ownership::Owned) => DataOwnedFunctionOwns,
}
}
}
@ -998,7 +998,10 @@ impl<'a, 'i> Context<'a, 'i> {
for p in ps.iter() {
let info = VarInfo {
reference: p.layout.contains_refcounted(self.layout_interner),
consume: !p.borrow,
consume: match p.ownership {
Ownership::Owned => true,
Ownership::Borrowed => false,
},
persistent: false,
reset: false,
};
@ -1020,7 +1023,7 @@ impl<'a, 'i> Context<'a, 'i> {
b_live_vars: &LiveVarSet,
) -> &'a Stmt<'a> {
for p in ps.iter() {
if !p.borrow
if p.ownership == Ownership::Owned
&& p.layout.contains_refcounted(self.layout_interner)
&& !b_live_vars.contains(&p.symbol)
{
@ -1340,7 +1343,7 @@ fn create_holl_call<'a>(
arguments: &'a [Symbol],
) -> Expr<'a> {
let call = crate::ir::Call {
call_type: if let Some(OWNED) = param.map(|p| p.borrow) {
call_type: if let Some(Ownership::Owned) = param.map(|p| p.ownership) {
let mut passed_function = holl.passed_function;
passed_function.owns_captured_environment = true;