Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions compiler/rustc_abi/src/layout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
size,
max_repr_align: None,
unadjusted_abi_align: element.align,
repr_c: element.repr_c,
trivial_abi: element.trivial_abi,
randomization_seed: element.randomization_seed.wrapping_add(Hash64::new(count)),
})
}
Expand Down Expand Up @@ -511,8 +511,10 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
};

// We also need to check for a `repr(transparent)` wrapper around `repr(C)`
let repr_c =
repr.c() || (repr.transparent() && only_variant.iter().any(|field| field.repr_c));
let trivial_abi = size == Size::ZERO
&& align == Align::ONE
&& !repr.c()
&& (!repr.transparent() || only_variant.iter().all(|field| field.trivial_abi));

let combined_seed = only_variant
.iter()
Expand All @@ -529,7 +531,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
size: size.align_to(align),
max_repr_align,
unadjusted_abi_align,
repr_c,
trivial_abi,
randomization_seed: combined_seed,
})
}
Expand Down Expand Up @@ -916,7 +918,10 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
};

// We also need to check for a `repr(transparent)` wrapper around `repr(C)`
let repr_c = repr.c() || (repr.transparent() && fields.iter().any(|field| field.repr_c));
let trivial_abi = size == Size::ZERO
&& align == Align::ONE
&& !repr.c()
&& (!repr.transparent() || fields.iter().all(|field| field.trivial_abi));

let seed = field_seed.wrapping_add(repr.field_shuffle_seed);

Expand All @@ -930,7 +935,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
size,
max_repr_align,
unadjusted_abi_align,
repr_c,
trivial_abi,
randomization_seed: seed,
})
}
Expand Down Expand Up @@ -1029,7 +1034,7 @@ where
align,
max_repr_align: None,
unadjusted_abi_align: elt.align,
repr_c: false,
trivial_abi: false,
randomization_seed: elt.randomization_seed.wrapping_add(Hash64::new(count.as_u64())),
})
}
6 changes: 3 additions & 3 deletions compiler/rustc_abi/src/layout/coroutine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ use rustc_index::{Idx, IndexSlice, IndexVec};
use tracing::{debug, trace};

use crate::{
BackendRepr, FieldsShape, HasDataLayout, Integer, LayoutData, Primitive, ReprOptions, Scalar,
StructKind, TagEncoding, VariantLayout, Variants, WrappingRange,
Align, BackendRepr, FieldsShape, HasDataLayout, Integer, LayoutData, Primitive, ReprOptions,
Scalar, Size, StructKind, TagEncoding, VariantLayout, Variants, WrappingRange,
};

/// This option controls how coroutine saved locals are packed
Expand Down Expand Up @@ -333,7 +333,7 @@ where
align,
max_repr_align: None,
unadjusted_abi_align: align,
repr_c: false,
trivial_abi: size == Size::ZERO && align == Align::ONE,
randomization_seed: Default::default(),
})
}
4 changes: 2 additions & 2 deletions compiler/rustc_abi/src/layout/enum_layout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ where
size,
max_repr_align,
unadjusted_abi_align,
repr_c: repr.c(),
trivial_abi: size == Size::ZERO && align == Align::ONE && !repr.c(),
randomization_seed: combined_seed,
})
}
Expand Down Expand Up @@ -656,7 +656,7 @@ where
align,
max_repr_align,
unadjusted_abi_align,
repr_c: repr.c(),
trivial_abi: size == Size::ZERO && align == Align::ONE && !repr.c(),
randomization_seed: combined_seed,
};

Expand Down
12 changes: 6 additions & 6 deletions compiler/rustc_abi/src/layout/simple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
size: Size::ZERO,
max_repr_align: None,
unadjusted_abi_align: Align::ONE,
repr_c: false,
trivial_abi: true,
randomization_seed: Hash64::new(0),
}
}
Expand All @@ -41,7 +41,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
size: Size::ZERO,
max_repr_align: None,
unadjusted_abi_align: Align::ONE,
repr_c: false,
trivial_abi: true,
randomization_seed: Hash64::ZERO,
}
}
Expand Down Expand Up @@ -84,7 +84,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
align,
max_repr_align: None,
unadjusted_abi_align: align,
repr_c: false,
trivial_abi: false,
randomization_seed: Hash64::new(randomization_seed),
}
}
Expand Down Expand Up @@ -118,7 +118,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
size,
max_repr_align: None,
unadjusted_abi_align: align,
repr_c: false,
trivial_abi: false,
randomization_seed: Hash64::new(combined_seed),
}
}
Expand All @@ -144,7 +144,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
size: Size::ZERO,
max_repr_align: None,
unadjusted_abi_align: Align::ONE,
repr_c: false,
trivial_abi: true,
// Variant layouts never flow back into actual layout computations,
// so dummy values are fine here.
randomization_seed: Hash64::ZERO,
Expand All @@ -171,7 +171,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
align: parent.align,
max_repr_align: parent.max_repr_align,
unadjusted_abi_align: parent.unadjusted_abi_align,
repr_c: parent.repr_c,
trivial_abi: parent.trivial_abi,
// Variant layouts never flow back into actual layout computations,
// so dummy values are fine here.
randomization_seed: Hash64::ZERO,
Expand Down
27 changes: 13 additions & 14 deletions compiler/rustc_abi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2264,12 +2264,11 @@ pub struct LayoutData<FieldIdx: Idx, VariantIdx: Idx> {
/// alignment in some cases.
pub unadjusted_abi_align: Align,

/// Whether this type is `repr(C)`, or a `repr(transparent)` wrapper around such,
/// or an array of such.
/// This matters because we must follow the C ABI for these types.
/// Some C ABIs pass `repr(C)` ZSTs by pointer, but `repr(Rust)` ZSTs should always
/// be ignored.
pub repr_c: bool,
/// Whether this type is a 1-ZST that is not `repr(C)`, or a `repr(transparent)` wrapper around
/// such, or an array of such.
/// This matters because we must follow the C ABI for non-trivial ZSTs.
/// Some C ABIs pass `repr(C)` ZSTs by pointer, but `repr(Rust)` ZSTs should always be ignored.
pub trivial_abi: bool,

/// The randomization seed based on this type's own repr and its fields.
///
Expand Down Expand Up @@ -2311,10 +2310,10 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
}
}

/// Returns `true` if this is a `repr(C)` type,
/// or an array of such, or a `repr(transparent)` wrapper around such
pub fn is_repr_c(&self) -> bool {
self.repr_c
/// Returns `true` if this is a 1-ZST that is not `repr(C)`,
/// or an array of such, or a `repr(transparent)` wrapper around such.
pub fn has_trivial_abi(&self) -> bool {
self.trivial_abi
}
}

Expand All @@ -2337,7 +2336,7 @@ where
variants,
max_repr_align,
unadjusted_abi_align,
repr_c,
trivial_abi,
randomization_seed,
} = self;
f.debug_struct("Layout")
Expand All @@ -2350,7 +2349,7 @@ where
.field("variants", variants)
.field("max_repr_align", max_repr_align)
.field("unadjusted_abi_align", unadjusted_abi_align)
.field("repr_c", repr_c)
.field("trivial_abi", trivial_abi)
.field("randomization_seed", randomization_seed)
.finish()
}
Expand Down Expand Up @@ -2470,12 +2469,12 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
// Inhabitedness and niches are not ABI-relevant.
largest_niche: _,
uninhabited: _,
// max_repr_align, unadjusted_abi_align, repr_c are not read directly by codegen
// max_repr_align, unadjusted_abi_align, trivial_abi are not read directly by codegen
// backends. They are only used to compute `PassMode`. So we can ignore them here, any
// differences they may cause are picked up by the `PassMode` check.
max_repr_align: _,
unadjusted_abi_align: _,
repr_c: _,
trivial_abi: _,
// The seed does not affect the ABI.
randomization_seed: _,
} = self;
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/callconv/powerpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ where
// powerpc-unknown-linux-{gnu,musl,uclibc} doesn't ignore ZSTs.
if cx.target_spec().os == Os::Linux
&& matches!(cx.target_spec().env, Env::Gnu | Env::Musl | Env::Uclibc)
&& arg.layout.is_repr_c()
&& !arg.layout.has_trivial_abi()
{
*gprs_in_use += 1;
arg.make_indirect_from_ignore();
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/callconv/s390x.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ where
// s390x-unknown-linux-{gnu,musl,uclibc} doesn't ignore ZSTs.
if cx.target_spec().os == Os::Linux
&& matches!(cx.target_spec().env, Env::Gnu | Env::Musl | Env::Uclibc)
&& arg.layout.is_repr_c()
&& !arg.layout.has_trivial_abi()
{
arg.make_indirect_from_ignore();
}
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/callconv/sparc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ where

for arg in fn_abi.args.iter_mut() {
if arg.is_ignore() {
if arg.layout.is_zst() && arg.layout.is_repr_c() {
if !arg.layout.has_trivial_abi() {
arg.make_indirect_from_ignore();
}
continue;
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/callconv/sparc64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ where
continue;
}
if arg.is_ignore() {
if passes_zsts && arg.layout.is_repr_c() {
if passes_zsts && !arg.layout.has_trivial_abi() {
arg.make_indirect_from_ignore();
double_word_count += 1;
}
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_target/src/callconv/x86_win64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ where
// but `repr(Rust)` ones are always ignored (ensuring that `()` matches C `void`).

if fn_abi.ret.is_ignore() {
if fn_abi.ret.layout.is_repr_c() {
if !fn_abi.ret.layout.has_trivial_abi() {
fn_abi.ret.make_indirect_from_ignore();
}
} else {
Expand All @@ -59,7 +59,7 @@ where

for arg in fn_abi.args.iter_mut() {
if arg.is_ignore() {
if arg.layout.is_repr_c() {
if !arg.layout.has_trivial_abi() {
arg.make_indirect_from_ignore();
}

Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.aarch64-darwin.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand All @@ -47,7 +47,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.powerpc-linux.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down Expand Up @@ -58,7 +58,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.s390x-linux.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down Expand Up @@ -58,7 +58,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.sparc-linux.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down Expand Up @@ -58,7 +58,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.sparc-none.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down Expand Up @@ -58,7 +58,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.sparc64-linux.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down Expand Up @@ -58,7 +58,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.x86_64-linux.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand All @@ -47,7 +47,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
max_repr_align: None,
unadjusted_abi_align: $SOME_ALIGN,
repr_c: true,
trivial_abi: false,
randomization_seed: $SEED,
},
},
Expand Down
Loading
Loading