language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge errors

Browse source
This commit is contained in:
J.Teeuwissen 2023-03-30 20:44:33 +02:00
parent 36f4969a5c
commit 7136750ee1
No known key found for this signature in database
GPG key ID: DB5F7A1ED8D478AD
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/compiler/mono/src/ir.rs
View file

@ -3293,7 +3293,6 @@ fn generate_host_exposed_function<'a>(
closure_data_layout: None, closure_data_layout: None,
ret_layout: result, ret_layout: result,
is_self_recursive: SelfRecursive::NotSelfRecursive, is_self_recursive: SelfRecursive::NotSelfRecursive,
must_own_arguments: false,
host_exposed_layouts: HostExposedLayouts::NotHostExposed, host_exposed_layouts: HostExposedLayouts::NotHostExposed,
}; };
@ -3358,7 +3357,6 @@ fn generate_host_exposed_lambda_set<'a>(
closure_data_layout: None, closure_data_layout: None,
ret_layout: return_layout, ret_layout: return_layout,
is_self_recursive: SelfRecursive::NotSelfRecursive, is_self_recursive: SelfRecursive::NotSelfRecursive,
must_own_arguments: false,
host_exposed_layouts: HostExposedLayouts::NotHostExposed, host_exposed_layouts: HostExposedLayouts::NotHostExposed,
}; };
@ -9722,7 +9720,6 @@ where
closure_data_layout: None, closure_data_layout: None,
ret_layout: *field, ret_layout: *field,
is_self_recursive: SelfRecursive::NotSelfRecursive, is_self_recursive: SelfRecursive::NotSelfRecursive,
must_own_arguments: false,
host_exposed_layouts: HostExposedLayouts::NotHostExposed, host_exposed_layouts: HostExposedLayouts::NotHostExposed,
}; };
@ -9818,7 +9815,6 @@ where
closure_data_layout: None, closure_data_layout: None,
ret_layout: *field, ret_layout: *field,
is_self_recursive: SelfRecursive::NotSelfRecursive, is_self_recursive: SelfRecursive::NotSelfRecursive,
must_own_arguments: false,
host_exposed_layouts: HostExposedLayouts::NotHostExposed, host_exposed_layouts: HostExposedLayouts::NotHostExposed,
}; };

32
crates/compiler/mono/src/perceus.rs
View file

@ -1273,6 +1273,8 @@ fn lowlevel_borrow_signature<'a>(arena: &'a Bump, op: &LowLevel) -> &'a [Ownersh
ListSublist => arena.alloc_slice_copy(&[owned, irrelevant, irrelevant]), ListSublist => arena.alloc_slice_copy(&[owned, irrelevant, irrelevant]),
ListDropAt => arena.alloc_slice_copy(&[owned, irrelevant]), ListDropAt => arena.alloc_slice_copy(&[owned, irrelevant]),
ListSwap => arena.alloc_slice_copy(&[owned, irrelevant, irrelevant]), ListSwap => arena.alloc_slice_copy(&[owned, irrelevant, irrelevant]),
ListReleaseExcessCapacity => arena.alloc_slice_copy(&[owned]),
StrReleaseExcessCapacity => arena.alloc_slice_copy(&[owned]),
Eq | NotEq => arena.alloc_slice_copy(&[borrowed, borrowed]), Eq | NotEq => arena.alloc_slice_copy(&[borrowed, borrowed]),
@ -1283,13 +1285,33 @@ fn lowlevel_borrow_signature<'a>(arena: &'a Bump, op: &LowLevel) -> &'a [Ownersh
| NumPow | NumPowInt | NumBitwiseAnd | NumBitwiseXor | NumBitwiseOr | NumShiftLeftBy | NumPow | NumPowInt | NumBitwiseAnd | NumBitwiseXor | NumBitwiseOr | NumShiftLeftBy
| NumShiftRightBy | NumShiftRightZfBy => arena.alloc_slice_copy(&[irrelevant, irrelevant]), | NumShiftRightBy | NumShiftRightZfBy => arena.alloc_slice_copy(&[irrelevant, irrelevant]),
NumToStr | NumAbs | NumNeg | NumSin | NumCos | NumSqrtUnchecked | NumLogUnchecked NumToStr
| NumRound | NumCeiling | NumFloor | NumToFrac | Not | NumIsFinite | NumAtan | NumAcos | NumAbs
| NumAsin | NumIntCast | NumToIntChecked | NumToFloatCast | NumToFloatChecked => { | NumNeg
arena.alloc_slice_copy(&[irrelevant]) | NumSin
} | NumCos
| NumSqrtUnchecked
| NumLogUnchecked
| NumRound
| NumCeiling
| NumFloor
| NumToFrac
| Not
| NumIsFinite
| NumAtan
| NumAcos
| NumAsin
| NumIntCast
| NumToIntChecked
| NumToFloatCast
| NumToFloatChecked
| NumCountLeadingZeroBits
| NumCountTrailingZeroBits
| NumCountOneBits => arena.alloc_slice_copy(&[irrelevant]),
NumBytesToU16 => arena.alloc_slice_copy(&[borrowed, irrelevant]), NumBytesToU16 => arena.alloc_slice_copy(&[borrowed, irrelevant]),
NumBytesToU32 => arena.alloc_slice_copy(&[borrowed, irrelevant]), NumBytesToU32 => arena.alloc_slice_copy(&[borrowed, irrelevant]),
NumBytesToU64 => arena.alloc_slice_copy(&[borrowed, irrelevant]),
NumBytesToU128 => arena.alloc_slice_copy(&[borrowed, irrelevant]),
StrStartsWith | StrEndsWith => arena.alloc_slice_copy(&[borrowed, borrowed]), StrStartsWith | StrEndsWith => arena.alloc_slice_copy(&[borrowed, borrowed]),
StrStartsWithScalar => arena.alloc_slice_copy(&[borrowed, irrelevant]), StrStartsWithScalar => arena.alloc_slice_copy(&[borrowed, irrelevant]),
StrFromUtf8Range => arena.alloc_slice_copy(&[owned, irrelevant, irrelevant]), StrFromUtf8Range => arena.alloc_slice_copy(&[owned, irrelevant, irrelevant]),