diff --git a/compiler/module/src/ident.rs b/compiler/module/src/ident.rs index 6dcf965313..4f4cb22196 100644 --- a/compiler/module/src/ident.rs +++ b/compiler/module/src/ident.rs @@ -59,7 +59,7 @@ pub enum TagName { Closure(Symbol), } -static_assertions::assert_eq_size!([u8; 24], TagName); +static_assertions::assert_eq_size!((usize, usize, u64), TagName); impl TagName { pub fn as_ident_str(&self, interns: &Interns, home: ModuleId) -> IdentStr { diff --git a/compiler/mono/src/ir.rs b/compiler/mono/src/ir.rs index 3c736435d9..c866a16d97 100644 --- a/compiler/mono/src/ir.rs +++ b/compiler/mono/src/ir.rs @@ -38,14 +38,14 @@ pub fn pretty_print_ir_symbols() -> bool { static_assertions::assert_eq_size!([u8; 4 * 8], Literal); #[cfg(not(target_arch = "aarch64"))] static_assertions::assert_eq_size!([u8; 3 * 8], Literal); -static_assertions::assert_eq_size!([u8; 10 * 8], Expr); +static_assertions::assert_eq_size!(([u64; 4], [usize; 6]), Expr); #[cfg(not(target_arch = "aarch64"))] -static_assertions::assert_eq_size!([u8; 19 * 8], Stmt); +static_assertions::assert_eq_size!(([u64; 5], [usize; 14]), Stmt); #[cfg(target_arch = "aarch64")] static_assertions::assert_eq_size!([u8; 20 * 8], Stmt); -static_assertions::assert_eq_size!([u8; 6 * 8], ProcLayout); -static_assertions::assert_eq_size!([u8; 7 * 8], Call); -static_assertions::assert_eq_size!([u8; 5 * 8], CallType); +static_assertions::assert_eq_size!([usize; 6], ProcLayout); +static_assertions::assert_eq_size!(([u64; 3], [usize; 4]), Call); +static_assertions::assert_eq_size!(([u64; 3], [usize; 2]), CallType); macro_rules! return_on_layout_error { ($env:expr, $layout_result:expr) => { diff --git a/compiler/mono/src/layout.rs b/compiler/mono/src/layout.rs index edcd676c00..b04993c9d6 100644 --- a/compiler/mono/src/layout.rs +++ b/compiler/mono/src/layout.rs @@ -18,10 +18,10 @@ use ven_pretty::{DocAllocator, DocBuilder}; // if your changes cause this number to go down, great! // please change it to the lower number. // if it went up, maybe check that the change is really required -static_assertions::assert_eq_size!([u8; 3 * 8], Builtin); -static_assertions::assert_eq_size!([u8; 4 * 8], Layout); -static_assertions::assert_eq_size!([u8; 3 * 8], UnionLayout); -static_assertions::assert_eq_size!([u8; 3 * 8], LambdaSet); +static_assertions::assert_eq_size!([usize; 3], Builtin); +static_assertions::assert_eq_size!([usize; 4], Layout); +static_assertions::assert_eq_size!([usize; 3], UnionLayout); +static_assertions::assert_eq_size!([usize; 3], LambdaSet); pub type TagIdIntType = u16; pub const MAX_ENUM_SIZE: usize = (std::mem::size_of::() * 8) as usize; diff --git a/compiler/types/src/subs.rs b/compiler/types/src/subs.rs index 94f3737aeb..c2500d7780 100644 --- a/compiler/types/src/subs.rs +++ b/compiler/types/src/subs.rs @@ -12,7 +12,7 @@ use ven_ena::unify::{InPlace, Snapshot, UnificationTable, UnifyKey}; static_assertions::assert_eq_size!([u8; 6 * 8], Descriptor); static_assertions::assert_eq_size!([u8; 4 * 8], Content); static_assertions::assert_eq_size!([u8; 3 * 8], FlatType); -static_assertions::assert_eq_size!([u8; 6 * 8], Problem); +static_assertions::assert_eq_size!(([usize; 4], [u64; 2]), Problem); static_assertions::assert_eq_size!([u8; 12], UnionTags); static_assertions::assert_eq_size!([u8; 2 * 8], RecordFields); @@ -1624,7 +1624,7 @@ impl From for Descriptor { } static_assertions::assert_eq_size!([u8; 4 * 8], Content); -static_assertions::assert_eq_size!([u8; 4 * 8], (Variable, Option)); +static_assertions::assert_eq_size!([usize; 4], (Variable, Option)); static_assertions::assert_eq_size!([u8; 3 * 8], (Symbol, AliasVariables, Variable)); static_assertions::assert_eq_size!([u8; 8], AliasVariables); static_assertions::assert_eq_size!([u8; 3 * 8], FlatType);