bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Change more x64 size checks to not apply to x32.

Browse source 
Commit 95e096d6 changed a bunch of size checks already, but more have
been added, so this fixes the new ones the same way: the various size
checks that are conditional on target_arch = "x86_64" were not intended
to apply to x86_64-unknown-linux-gnux32, so add
target_pointer_width = "64" to the conditions.
This commit is contained in:
Harald van Dijk 2021-09-05 16:42:36 +01:00
parent f7c00dc409
commit cd75af25e0
No known key found for this signature in database
GPG key ID: 7D71BB318A5BD56D
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_middle/src/mir/mod.rs
View file

@ -1708,7 +1708,7 @@ pub struct Place<'tcx> {
pub projection: &'tcx List<PlaceElem<'tcx>>, pub projection: &'tcx List<PlaceElem<'tcx>>,
} }
#[cfg(target_arch = "x86_64")] #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
static_assert_size!(Place<'_>, 16); static_assert_size!(Place<'_>, 16);
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@ -2034,7 +2034,7 @@ pub enum Operand<'tcx> {
Constant(Box<Constant<'tcx>>), Constant(Box<Constant<'tcx>>),
} }
#[cfg(target_arch = "x86_64")] #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
static_assert_size!(Operand<'_>, 24); static_assert_size!(Operand<'_>, 24);
impl<'tcx> Debug for Operand<'tcx> { impl<'tcx> Debug for Operand<'tcx> {
@ -2172,7 +2172,7 @@ pub enum Rvalue<'tcx> {
Aggregate(Box<AggregateKind<'tcx>>, Vec<Operand<'tcx>>), Aggregate(Box<AggregateKind<'tcx>>, Vec<Operand<'tcx>>),
} }
#[cfg(target_arch = "x86_64")] #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
static_assert_size!(Rvalue<'_>, 40); static_assert_size!(Rvalue<'_>, 40);
#[derive(Clone, Copy, Debug, PartialEq, Eq, TyEncodable, TyDecodable, Hash, HashStable)] #[derive(Clone, Copy, Debug, PartialEq, Eq, TyEncodable, TyDecodable, Hash, HashStable)]
@ -2198,7 +2198,7 @@ pub enum AggregateKind<'tcx> {
Generator(DefId, SubstsRef<'tcx>, hir::Movability), Generator(DefId, SubstsRef<'tcx>, hir::Movability),
} }
#[cfg(target_arch = "x86_64")] #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
static_assert_size!(AggregateKind<'_>, 48); static_assert_size!(AggregateKind<'_>, 48);
#[derive(Copy, Clone, Debug, PartialEq, PartialOrd, Eq, TyEncodable, TyDecodable, Hash, HashStable)] #[derive(Copy, Clone, Debug, PartialEq, PartialOrd, Eq, TyEncodable, TyDecodable, Hash, HashStable)]

2
compiler/rustc_parse/src/parser/attr_wrapper.rs
View file

@ -34,7 +34,7 @@ pub struct AttrWrapper {
// This struct is passed around very frequently, // This struct is passed around very frequently,
// so make sure it doesn't accidentally get larger // so make sure it doesn't accidentally get larger
#[cfg(target_arch = "x86_64")] #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(AttrWrapper, 16); rustc_data_structures::static_assert_size!(AttrWrapper, 16);
impl AttrWrapper { impl AttrWrapper {

2
src/librustdoc/html/render/context.rs
View file

@ -69,7 +69,7 @@ crate struct Context<'tcx> {
} }
// `Context` is cloned a lot, so we don't want the size to grow unexpectedly. // `Context` is cloned a lot, so we don't want the size to grow unexpectedly.
#[cfg(target_arch = "x86_64")] #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(Context<'_>, 104); rustc_data_structures::static_assert_size!(Context<'_>, 104);
/// Shared mutable state used in [`Context`] and elsewhere. /// Shared mutable state used in [`Context`] and elsewhere.