bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't discard preferred alignment in scalar pair.

Browse source
This commit is contained in:
Luqman Aden 2023-02-18 19:55:11 -08:00
parent 3b1e535f36
commit c63a204e23
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_abi/src/lib.rs
View file

@ -1,11 +1,11 @@
#![cfg_attr(feature = "nightly", feature(step_trait, rustc_attrs, min_specialization))] #![cfg_attr(feature = "nightly", feature(step_trait, rustc_attrs, min_specialization))]
use std::fmt;
#[cfg(feature = "nightly")] #[cfg(feature = "nightly")]
use std::iter::Step; use std::iter::Step;
use std::num::{NonZeroUsize, ParseIntError}; use std::num::{NonZeroUsize, ParseIntError};
use std::ops::{Add, AddAssign, Mul, RangeInclusive, Sub}; use std::ops::{Add, AddAssign, Mul, RangeInclusive, Sub};
use std::str::FromStr; use std::str::FromStr;
use std::{cmp, fmt};
use bitflags::bitflags; use bitflags::bitflags;
use rustc_data_structures::intern::Interned; use rustc_data_structures::intern::Interned;
@ -1277,9 +1277,7 @@ impl Abi {
pub fn inherent_align<C: HasDataLayout>(&self, cx: &C) -> Option<AbiAndPrefAlign> { pub fn inherent_align<C: HasDataLayout>(&self, cx: &C) -> Option<AbiAndPrefAlign> {
Some(match *self { Some(match *self {
Abi::Scalar(s) => s.align(cx), Abi::Scalar(s) => s.align(cx),
Abi::ScalarPair(s1, s2) => { Abi::ScalarPair(s1, s2) => s1.align(cx).max(s2.align(cx)),
AbiAndPrefAlign::new(cmp::max(s1.align(cx).abi, s2.align(cx).abi))
}
Abi::Vector { element, count } => { Abi::Vector { element, count } => {
cx.data_layout().vector_align(element.size(cx) * count) cx.data_layout().vector_align(element.size(cx) * count)
} }