diff options
author | Luqman Aden <me@luqman.ca> | 2023-02-18 19:55:11 -0800 |
---|---|---|
committer | Luqman Aden <me@luqman.ca> | 2023-05-05 16:11:08 -0700 |
commit | c63a204e239f8360cfe8e35946e43a87a1c77577 (patch) | |
tree | 0a228c79287d5e83af2fa03f6e248d804620fbf9 /compiler/rustc_abi | |
parent | 3b1e535f36ac4c47dc91d0e3394dca72fb86db0c (diff) | |
download | rust-c63a204e239f8360cfe8e35946e43a87a1c77577.tar.gz |
Don't discard preferred alignment in scalar pair.
Diffstat (limited to 'compiler/rustc_abi')
-rw-r--r-- | compiler/rustc_abi/src/lib.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_abi/src/lib.rs b/compiler/rustc_abi/src/lib.rs index 9c8a59979aa..6d96b3db93c 100644 --- a/compiler/rustc_abi/src/lib.rs +++ b/compiler/rustc_abi/src/lib.rs @@ -1,11 +1,11 @@ #![cfg_attr(feature = "nightly", feature(step_trait, rustc_attrs, min_specialization))] +use std::fmt; #[cfg(feature = "nightly")] use std::iter::Step; use std::num::{NonZeroUsize, ParseIntError}; use std::ops::{Add, AddAssign, Mul, RangeInclusive, Sub}; use std::str::FromStr; -use std::{cmp, fmt}; use bitflags::bitflags; use rustc_data_structures::intern::Interned; @@ -1277,9 +1277,7 @@ impl Abi { pub fn inherent_align<C: HasDataLayout>(&self, cx: &C) -> Option<AbiAndPrefAlign> { Some(match *self { Abi::Scalar(s) => s.align(cx), - Abi::ScalarPair(s1, s2) => { - AbiAndPrefAlign::new(cmp::max(s1.align(cx).abi, s2.align(cx).abi)) - } + Abi::ScalarPair(s1, s2) => s1.align(cx).max(s2.align(cx)), Abi::Vector { element, count } => { cx.data_layout().vector_align(element.size(cx) * count) } |