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

fix merge conflict

Browse source
This commit is contained in:
Folkert 2022-07-23 15:46:41 +02:00
parent 93c331e1aa
commit 48e0938e8b
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/compiler/mono/src/layout.rs
View file

@ -633,23 +633,6 @@ impl<'a> UnionLayout<'a> {
round_up_to_alignment(data_width, data_align)
}
pub fn tag_id_offset(&self, target_info: TargetInfo) -> Option<u32> {
use UnionLayout::*;
if let NonNullableUnwrapped(_) | NullableUnwrapped { .. } = self {
return None;
}
let data_width = self.data_size_and_alignment_help_match(None, target_info).0;
// current, broken logic
if data_width > 8 {
Some(round_up_to_alignment(data_width, 8))
} else {
Some(data_width)
}
}
/// Very important to use this when doing a memcpy!
fn stack_size_without_alignment(&self, target_info: TargetInfo) -> u32 {
match self {