Merge pull request rust-lang#20272 from glaubitz/x32-fixes

hir-def: Don't apply x86_64-specific asserts on x32

Author: lnicola

src/tools/rust-analyzer/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::<Path>() == 24);
     assert!(size_of::<Option<Path>>() == 24);

src/tools/rust-analyzer/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::<TypeRef>() == 24);
 
 pub type TypeRefId = Idx<TypeRef>;