nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #83319 - tmiasko:packed-aligned, r=jackh726

Browse Source 
Layout error instead of an ICE for packed and aligned types

Fixes #83107.
This commit is contained in:
bors 2021-07-15 19:51:17 +00:00
commit b1f8e27b74
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_middle/src/ty/layout.rs
View File

@ -312,7 +312,8 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
let dl = self.data_layout();
let pack = repr.pack;
if pack.is_some() && repr.align.is_some() {
bug!("struct cannot be packed and aligned");
self.tcx.sess.delay_span_bug(DUMMY_SP, "struct cannot be packed and aligned");
return Err(LayoutError::Unknown(ty));
}
let mut align = if pack.is_some() { dl.i8_align } else { dl.aggregate_align };
@ -808,7 +809,11 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
if def.is_union() {
if def.repr.pack.is_some() && def.repr.align.is_some() {
bug!("union cannot be packed and aligned");
self.tcx.sess.delay_span_bug(
tcx.def_span(def.did),
"union cannot be packed and aligned",
);
return Err(LayoutError::Unknown(ty));
}
let mut align =

11
src/test/ui/conflicting-repr-hints.rs
View File

@ -66,4 +66,15 @@ union Z {
i: i32,
}
#[repr(packed, align(0x100))]
pub struct S(u16); //~ ERROR type has conflicting packed and align representation hints
#[repr(packed, align(0x100))]
pub union U { //~ ERROR type has conflicting packed and align representation hints
u: u16
}
static B: U = U { u: 0 };
static A: S = S(0);
fn main() {}

16
src/test/ui/conflicting-repr-hints.stderr
View File

@ -74,7 +74,21 @@ LL | | i: i32,
LL | | }
| |_^
error: aborting due to 10 previous errors
error[E0587]: type has conflicting packed and align representation hints
--> $DIR/conflicting-repr-hints.rs:70:1
|
LL | pub struct S(u16);
| ^^^^^^^^^^^^^^^^^^
error[E0587]: type has conflicting packed and align representation hints
--> $DIR/conflicting-repr-hints.rs:73:1
|
LL | / pub union U {
LL | | u: u16
LL | | }
| |_^
error: aborting due to 12 previous errors
Some errors have detailed explanations: E0566, E0587, E0634.
For more information about an error, try `rustc --explain E0566`.