Skip to content

Commit

Permalink
Merge from rustc
Browse files Browse the repository at this point in the history
  • Loading branch information
The Miri Cronjob Bot committed Apr 19, 2024
2 parents fd7755f + 6939ad5 commit 18f3357
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,12 @@ pub enum ProvenanceExtra {
Wildcard,
}

#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
#[cfg(target_pointer_width = "64")]
static_assert_size!(Pointer<Provenance>, 24);
// FIXME: this would with in 24bytes but layout optimizations are not smart enough
// #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
// #[cfg(target_pointer_width = "64")]
//static_assert_size!(Pointer<Option<Provenance>>, 24);
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
#[cfg(target_pointer_width = "64")]
static_assert_size!(Scalar<Provenance>, 32);

impl fmt::Debug for Provenance {
Expand Down

0 comments on commit 18f3357

Please sign in to comment.