From 25122d928932d0f045ed8b42960f332723cf009d Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Mon, 21 Jul 2025 17:03:07 +0200 Subject: [PATCH] hir-def: Don't apply x86_64-specific asserts on x32 This fixes the rustc build on x32 for which struct sizes differ. --- crates/hir-def/src/expr_store/path.rs | 2 +- crates/hir-def/src/hir/type_ref.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/hir-def/src/expr_store/path.rs b/crates/hir-def/src/expr_store/path.rs index 19c7ce0ce042..55e738b58bd0 100644 --- a/crates/hir-def/src/expr_store/path.rs +++ b/crates/hir-def/src/expr_store/path.rs @@ -27,7 +27,7 @@ pub enum Path { } // This type is being used a lot, make sure it doesn't grow unintentionally. -#[cfg(target_arch = "x86_64")] +#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] const _: () = { assert!(size_of::() == 24); assert!(size_of::>() == 24); diff --git a/crates/hir-def/src/hir/type_ref.rs b/crates/hir-def/src/hir/type_ref.rs index eacc3f3cedfe..da0f058a9cb5 100644 --- a/crates/hir-def/src/hir/type_ref.rs +++ b/crates/hir-def/src/hir/type_ref.rs @@ -148,7 +148,7 @@ pub enum TypeRef { Error, } -#[cfg(target_arch = "x86_64")] +#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] const _: () = assert!(size_of::() == 24); pub type TypeRefId = Idx;