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

Rollup merge of #96581 - RalfJung:debug-size-align, r=oli-obk

Browse Source 
make Size and Align debug-printing a bit more compact

In particular in `{:#?}`-mode, these take up a lot of space, so I think this is the better alternative (even though it is a bit longer in `{:?}` mode, I think it is still more readable).

We could make it even smaller by deviating further from what the actual code looks like, e.g. via something like `Size(4 bytes)`. Not sure what people would think about that?

Cc `````@oli-obk`````
This commit is contained in:
Guillaume Gomez 2022-05-07 15:23:44 +02:00 committed by GitHub
commit c29f8575ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 244 additions and 555 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_middle/src/mir/pretty.rs
View File

@ -448,6 +448,12 @@ impl<'tcx> Visitor<'tcx> for ExtraComments<'tcx> {
self.push(&format!("+ user_ty: {:?}", user_ty));
}
let fmt_val = |val: &ConstValue<'tcx>| match val {
ConstValue::Scalar(s) => format!("Scalar({:?})", s),
ConstValue::Slice { .. } => format!("Slice(..)"),
ConstValue::ByRef { .. } => format!("ByRef(..)"),
};
let val = match literal {
ConstantKind::Ty(ct) => match ct.val() {
ty::ConstKind::Param(p) => format!("Param({})", p),
@ -457,7 +463,7 @@ impl<'tcx> Visitor<'tcx> for ExtraComments<'tcx> {
uv.substs,
uv.promoted,
),
ty::ConstKind::Value(val) => format!("Value({:?})", val),
ty::ConstKind::Value(val) => format!("Value({})", fmt_val(&val)),
ty::ConstKind::Error(_) => "Error".to_string(),
// These variants shouldn't exist in the MIR.
ty::ConstKind::Placeholder(_)
@ -467,7 +473,7 @@ impl<'tcx> Visitor<'tcx> for ExtraComments<'tcx> {
// To keep the diffs small, we render this like we render `ty::Const::Value`.
//
// This changes once `ty::Const::Value` is represented using valtrees.
ConstantKind::Val(val, _) => format!("Value({:?})", val),
ConstantKind::Val(val, _) => format!("Value({})", fmt_val(&val)),
};
self.push(&format!("+ literal: Const {{ ty: {}, val: {} }}", literal.ty(), val));

18
compiler/rustc_target/src/abi/mod.rs
View File

@ -276,12 +276,19 @@ impl ToJson for Endian {
}
/// Size of a type in bytes.
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Encodable, Decodable)]
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Encodable, Decodable)]
#[derive(HashStable_Generic)]
pub struct Size {
raw: u64,
}
// This is debug-printed a lot in larger structs, don't waste too much space there
impl fmt::Debug for Size {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "Size({} bytes)", self.bytes())
}
}
impl Size {
pub const ZERO: Size = Size { raw: 0 };
@ -485,12 +492,19 @@ impl Step for Size {
}
/// Alignment of a type in bytes (always a power of two).
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Encodable, Decodable)]
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Encodable, Decodable)]
#[derive(HashStable_Generic)]
pub struct Align {
pow2: u8,
}
// This is debug-printed a lot in larger structs, don't waste too much space there
impl fmt::Debug for Align {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "Align({} bytes)", self.bytes())
}
}
impl Align {
pub const ONE: Align = Align { pow2: 0 };

2
src/test/mir-opt/const_debuginfo.main.ConstDebugInfo.diff
View File

@ -77,7 +77,7 @@
_9 = const "hello, world!"; // scope 4 at $DIR/const_debuginfo.rs:14:13: 14:28
// mir::Constant
// + span: $DIR/const_debuginfo.rs:14:13: 14:28
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 101, 108, 108, 111, 44, 32, 119, 111, 114, 108, 100, 33], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [8191], len: Size { raw: 13 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 13 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
StorageLive(_10); // scope 5 at $DIR/const_debuginfo.rs:16:9: 16:10
Deinit(_10); // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34
(_10.0: bool) = const true; // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34

2
src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff
View File

@ -22,7 +22,7 @@
// + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
// mir::Constant
// + span: $SRC_DIR/std/src/panic.rs:LL:COL
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
}
bb2: {

2
src/test/mir-opt/inline/inline_diverging.g.Inline.diff
View File

@ -43,7 +43,7 @@
+ // + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
+ // mir::Constant
+ // + span: $SRC_DIR/std/src/panic.rs:LL:COL
+ // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
+ // + literal: Const { ty: &str, val: Value(Slice(..)) }
}
}

2
src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff
View File

@ -46,7 +46,7 @@
- bb2: {
+ // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+ // + user_ty: UserType(0)
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef(..)) }
+ Deinit((*_7)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+ ((*_7).0: alloc::raw_vec::RawVec<u32>) = move _8; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+ ((*_7).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL

2
src/test/mir-opt/inline/inline_into_box_place.main.Inline.64bit.diff
View File

@ -46,7 +46,7 @@
- bb2: {
+ // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+ // + user_ty: UserType(0)
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [65535], len: Size { raw: 16 } }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef(..)) }
+ Deinit((*_7)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+ ((*_7).0: alloc::raw_vec::RawVec<u32>) = move _8; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
+ ((*_7).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL

2
src/test/mir-opt/issue_76432.test.SimplifyComparisonIntegral.diff
View File

@ -73,7 +73,7 @@
// + literal: Const { ty: fn(&'static str) -> ! {core::panicking::panic}, val: Value(Scalar(<ZST>)) }
// mir::Constant
// + span: $SRC_DIR/core/src/panic.rs:LL:COL
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [105, 110, 116, 101, 114, 110, 97, 108, 32, 101, 114, 114, 111, 114, 58, 32, 101, 110, 116, 101, 114, 101, 100, 32, 117, 110, 114, 101, 97, 99, 104, 97, 98, 108, 101, 32, 99, 111, 100, 101], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1099511627775], len: Size { raw: 40 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 40 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
}
bb2: {

2
src/test/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.mir
View File

@ -92,7 +92,7 @@ fn num_to_digit(_1: char) -> u32 {
// + literal: Const { ty: fn(&'static str) -> ! {core::panicking::panic}, val: Value(Scalar(<ZST>)) }
// mir::Constant
// + span: $SRC_DIR/core/src/option.rs:LL:COL
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [99, 97, 108, 108, 101, 100, 32, 96, 79, 112, 116, 105, 111, 110, 58, 58, 117, 110, 119, 114, 97, 112, 40, 41, 96, 32, 111, 110, 32, 97, 32, 96, 78, 111, 110, 101, 96, 32, 118, 97, 108, 117, 101], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [8796093022207], len: Size { raw: 43 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 43 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
}
bb7: {

2
src/test/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.mir
View File

@ -26,7 +26,7 @@ fn unwrap(_1: Option<T>) -> T {
// + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
// mir::Constant
// + span: $SRC_DIR/std/src/panic.rs:LL:COL
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
}
bb2: {

2
src/test/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir
View File

@ -15,7 +15,7 @@ fn main() -> () {
_4 = const ""; // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
// mir::Constant
// + span: $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [], len: Size { raw: 0 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_3 = &(*_4); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
_2 = <str as ToString>::to_string(move _3) -> bb1; // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
// mir::Constant

2
src/test/mir-opt/storage_live_dead_in_statics.XXX.mir_map.0.mir
View File

@ -192,7 +192,7 @@ static XXX: &Foo = {
_2 = Foo { tup: const "hi", data: move _3 }; // scope 0 at $DIR/storage_live_dead_in_statics.rs:5:29: 23:2
// mir::Constant
// + span: $DIR/storage_live_dead_in_statics.rs:6:10: 6:14
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [3], len: Size { raw: 2 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
StorageDead(_3); // scope 0 at $DIR/storage_live_dead_in_statics.rs:23:1: 23:2
_1 = &_2; // scope 0 at $DIR/storage_live_dead_in_statics.rs:5:28: 23:2
_0 = &(*_1); // scope 0 at $DIR/storage_live_dead_in_statics.rs:5:28: 23:2

6
src/test/mir-opt/uninhabited_enum_branching.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir
View File

@ -22,7 +22,7 @@ fn main() -> () {
_5 = const "C"; // scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching.rs:23:21: 23:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_1 = &(*_5); // scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24
StorageDead(_5); // scope 0 at $DIR/uninhabited_enum_branching.rs:23:23: 23:24
StorageDead(_2); // scope 0 at $DIR/uninhabited_enum_branching.rs:24:6: 24:7
@ -40,7 +40,7 @@ fn main() -> () {
_9 = const "E"; // scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching.rs:28:21: 28:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [69], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_6 = &(*_9); // scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24
StorageDead(_9); // scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24
goto -> bb3; // scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24
@ -50,7 +50,7 @@ fn main() -> () {
_6 = const "D"; // scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching.rs:27:21: 27:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
goto -> bb3; // scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24
}

10
src/test/mir-opt/uninhabited_enum_branching.main.UninhabitedEnumBranching.diff
View File

@ -28,7 +28,7 @@
_5 = const "C"; // scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching.rs:23:21: 23:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_1 = &(*_5); // scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24
StorageDead(_5); // scope 0 at $DIR/uninhabited_enum_branching.rs:23:23: 23:24
goto -> bb4; // scope 0 at $DIR/uninhabited_enum_branching.rs:23:23: 23:24
@ -38,7 +38,7 @@
_1 = const "A(Empty)"; // scope 0 at $DIR/uninhabited_enum_branching.rs:21:24: 21:34
// mir::Constant
// + span: $DIR/uninhabited_enum_branching.rs:21:24: 21:34
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [65, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
goto -> bb4; // scope 0 at $DIR/uninhabited_enum_branching.rs:21:24: 21:34
}
@ -47,7 +47,7 @@
_4 = const "B(Empty)"; // scope 0 at $DIR/uninhabited_enum_branching.rs:22:24: 22:34
// mir::Constant
// + span: $DIR/uninhabited_enum_branching.rs:22:24: 22:34
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [66, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_1 = &(*_4); // scope 0 at $DIR/uninhabited_enum_branching.rs:22:24: 22:34
StorageDead(_4); // scope 0 at $DIR/uninhabited_enum_branching.rs:22:33: 22:34
goto -> bb4; // scope 0 at $DIR/uninhabited_enum_branching.rs:22:33: 22:34
@ -69,7 +69,7 @@
_9 = const "E"; // scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching.rs:28:21: 28:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [69], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_6 = &(*_9); // scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24
StorageDead(_9); // scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24
goto -> bb7; // scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24
@ -79,7 +79,7 @@
_6 = const "D"; // scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching.rs:27:21: 27:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
goto -> bb7; // scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24
}

8
src/test/mir-opt/uninhabited_enum_branching2.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir
View File

@ -40,7 +40,7 @@ fn main() -> () {
_8 = const "D"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:25:21: 25:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:25:21: 25:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_3 = &(*_8); // scope 1 at $DIR/uninhabited_enum_branching2.rs:25:21: 25:24
StorageDead(_8); // scope 1 at $DIR/uninhabited_enum_branching2.rs:25:23: 25:24
goto -> bb3; // scope 1 at $DIR/uninhabited_enum_branching2.rs:25:23: 25:24
@ -51,7 +51,7 @@ fn main() -> () {
_7 = const "C"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:24:21: 24:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:24:21: 24:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_3 = &(*_7); // scope 1 at $DIR/uninhabited_enum_branching2.rs:24:21: 24:24
StorageDead(_7); // scope 1 at $DIR/uninhabited_enum_branching2.rs:24:23: 24:24
goto -> bb3; // scope 1 at $DIR/uninhabited_enum_branching2.rs:24:23: 24:24
@ -70,7 +70,7 @@ fn main() -> () {
_13 = const "D"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:32:21: 32:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:32:21: 32:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_9 = &(*_13); // scope 1 at $DIR/uninhabited_enum_branching2.rs:32:21: 32:24
StorageDead(_13); // scope 1 at $DIR/uninhabited_enum_branching2.rs:32:23: 32:24
goto -> bb6; // scope 1 at $DIR/uninhabited_enum_branching2.rs:32:23: 32:24
@ -81,7 +81,7 @@ fn main() -> () {
_12 = const "C"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:31:21: 31:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:31:21: 31:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_9 = &(*_12); // scope 1 at $DIR/uninhabited_enum_branching2.rs:31:21: 31:24
StorageDead(_12); // scope 1 at $DIR/uninhabited_enum_branching2.rs:31:23: 31:24
goto -> bb6; // scope 1 at $DIR/uninhabited_enum_branching2.rs:31:23: 31:24

16
src/test/mir-opt/uninhabited_enum_branching2.main.UninhabitedEnumBranching.diff
View File

@ -42,7 +42,7 @@
_8 = const "D"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:25:21: 25:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:25:21: 25:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_3 = &(*_8); // scope 1 at $DIR/uninhabited_enum_branching2.rs:25:21: 25:24
StorageDead(_8); // scope 1 at $DIR/uninhabited_enum_branching2.rs:25:23: 25:24
goto -> bb5; // scope 1 at $DIR/uninhabited_enum_branching2.rs:25:23: 25:24
@ -52,7 +52,7 @@
_3 = const "A(Empty)"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:22:24: 22:34
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:22:24: 22:34
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [65, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
goto -> bb5; // scope 1 at $DIR/uninhabited_enum_branching2.rs:22:24: 22:34
}
@ -61,7 +61,7 @@
_6 = const "B(Empty)"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:23:24: 23:34
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:23:24: 23:34
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [66, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_3 = &(*_6); // scope 1 at $DIR/uninhabited_enum_branching2.rs:23:24: 23:34
StorageDead(_6); // scope 1 at $DIR/uninhabited_enum_branching2.rs:23:33: 23:34
goto -> bb5; // scope 1 at $DIR/uninhabited_enum_branching2.rs:23:33: 23:34
@ -72,7 +72,7 @@
_7 = const "C"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:24:21: 24:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:24:21: 24:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_3 = &(*_7); // scope 1 at $DIR/uninhabited_enum_branching2.rs:24:21: 24:24
StorageDead(_7); // scope 1 at $DIR/uninhabited_enum_branching2.rs:24:23: 24:24
goto -> bb5; // scope 1 at $DIR/uninhabited_enum_branching2.rs:24:23: 24:24
@ -92,7 +92,7 @@
_13 = const "D"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:32:21: 32:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:32:21: 32:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_9 = &(*_13); // scope 1 at $DIR/uninhabited_enum_branching2.rs:32:21: 32:24
StorageDead(_13); // scope 1 at $DIR/uninhabited_enum_branching2.rs:32:23: 32:24
goto -> bb10; // scope 1 at $DIR/uninhabited_enum_branching2.rs:32:23: 32:24
@ -102,7 +102,7 @@
_9 = const "A(Empty)"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:29:24: 29:34
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:29:24: 29:34
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [65, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
goto -> bb10; // scope 1 at $DIR/uninhabited_enum_branching2.rs:29:24: 29:34
}
@ -111,7 +111,7 @@
_11 = const "B(Empty)"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:30:24: 30:34
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:30:24: 30:34
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [66, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_9 = &(*_11); // scope 1 at $DIR/uninhabited_enum_branching2.rs:30:24: 30:34
StorageDead(_11); // scope 1 at $DIR/uninhabited_enum_branching2.rs:30:33: 30:34
goto -> bb10; // scope 1 at $DIR/uninhabited_enum_branching2.rs:30:33: 30:34
@ -122,7 +122,7 @@
_12 = const "C"; // scope 1 at $DIR/uninhabited_enum_branching2.rs:31:21: 31:24
// mir::Constant
// + span: $DIR/uninhabited_enum_branching2.rs:31:21: 31:24
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
// + literal: Const { ty: &str, val: Value(Slice(..)) }
_9 = &(*_12); // scope 1 at $DIR/uninhabited_enum_branching2.rs:31:21: 31:24
StorageDead(_12); // scope 1 at $DIR/uninhabited_enum_branching2.rs:31:23: 31:24
goto -> bb10; // scope 1 at $DIR/uninhabited_enum_branching2.rs:31:23: 31:24

2
src/test/ui/layout/debug.rs
View File

@ -1,4 +1,4 @@
// normalize-stderr-test "pref: Align \{\n *pow2: [1-3],\n *\}" -> "pref: $$PREF_ALIGN"
// normalize-stderr-test "pref: Align\([1-8] bytes\)" -> "pref: $$PREF_ALIGN"
#![feature(never_type, rustc_attrs, type_alias_impl_trait)]
#![crate_type = "lib"]

120
src/test/ui/layout/debug.stderr
View File

@ -1,9 +1,7 @@
error: layout_of(E) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -33,27 +31,17 @@ error: layout_of(E) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 4,
},
size: Size(4 bytes),
},
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 4,
},
Size {
raw: 4,
},
Size {
raw: 8,
},
Size(4 bytes),
Size(4 bytes),
Size(8 bytes),
],
memory_index: [
0,
@ -67,14 +55,10 @@ error: layout_of(E) = Layout {
abi: Uninhabited,
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
abi: Align(4 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 12,
},
size: Size(12 bytes),
},
],
},
@ -83,9 +67,7 @@ error: layout_of(E) = Layout {
},
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I32,
false,
@ -94,14 +76,10 @@ error: layout_of(E) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
abi: Align(4 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 12,
},
size: Size(12 bytes),
}
--> $DIR/debug.rs:6:1
|
@ -111,15 +89,9 @@ LL | enum E { Foo, Bar(!, i32, i32) }
error: layout_of(S) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size {
raw: 0,
},
Size {
raw: 4,
},
Size(0 bytes),
Size(0 bytes),
Size(4 bytes),
],
memory_index: [
1,
@ -148,14 +120,10 @@ error: layout_of(S) = Layout {
),
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
abi: Align(4 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 8,
},
size: Size(8 bytes),
}
--> $DIR/debug.rs:9:1
|
@ -174,14 +142,10 @@ error: layout_of(U) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
abi: Align(4 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 8,
},
size: Size(8 bytes),
}
--> $DIR/debug.rs:12:1
|
@ -191,9 +155,7 @@ LL | union U { f1: (i32, i32), f3: i32 }
error: layout_of(std::result::Result<i32, i32>) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -213,9 +175,7 @@ error: layout_of(std::result::Result<i32, i32>) = Layout {
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 4,
},
Size(4 bytes),
],
memory_index: [
0,
@ -229,21 +189,15 @@ error: layout_of(std::result::Result<i32, i32>) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
abi: Align(4 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 8,
},
size: Size(8 bytes),
},
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 4,
},
Size(4 bytes),
],
memory_index: [
0,
@ -257,14 +211,10 @@ error: layout_of(std::result::Result<i32, i32>) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
abi: Align(4 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 8,
},
size: Size(8 bytes),
},
],
},
@ -286,9 +236,7 @@ error: layout_of(std::result::Result<i32, i32>) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I32,
false,
@ -297,14 +245,10 @@ error: layout_of(std::result::Result<i32, i32>) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
abi: Align(4 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 8,
},
size: Size(8 bytes),
}
--> $DIR/debug.rs:15:1
|
@ -327,14 +271,10 @@ error: layout_of(i32) = Layout {
),
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
abi: Align(4 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 4,
},
size: Size(4 bytes),
}
--> $DIR/debug.rs:18:1
|

160
src/test/ui/layout/hexagon-enum.stderr
View File

@ -1,9 +1,7 @@
error: layout_of(A) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -33,16 +31,10 @@ error: layout_of(A) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 0,
},
},
size: Size {
raw: 1,
abi: Align(1 bytes),
pref: Align(1 bytes),
},
size: Size(1 bytes),
},
],
},
@ -57,9 +49,7 @@ error: layout_of(A) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -68,16 +58,10 @@ error: layout_of(A) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 0,
},
},
size: Size {
raw: 1,
abi: Align(1 bytes),
pref: Align(1 bytes),
},
size: Size(1 bytes),
}
--> $DIR/hexagon-enum.rs:16:1
|
@ -87,9 +71,7 @@ LL | enum A { Apple }
error: layout_of(B) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -119,16 +101,10 @@ error: layout_of(B) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 0,
},
},
size: Size {
raw: 1,
abi: Align(1 bytes),
pref: Align(1 bytes),
},
size: Size(1 bytes),
},
],
},
@ -143,9 +119,7 @@ error: layout_of(B) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -154,16 +128,10 @@ error: layout_of(B) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 0,
},
},
size: Size {
raw: 1,
abi: Align(1 bytes),
pref: Align(1 bytes),
},
size: Size(1 bytes),
}
--> $DIR/hexagon-enum.rs:20:1
|
@ -173,9 +141,7 @@ LL | enum B { Banana = 255, }
error: layout_of(C) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -205,16 +171,10 @@ error: layout_of(C) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 1,
},
pref: Align {
pow2: 1,
},
},
size: Size {
raw: 2,
abi: Align(2 bytes),
pref: Align(2 bytes),
},
size: Size(2 bytes),
},
],
},
@ -229,9 +189,7 @@ error: layout_of(C) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I16,
false,
@ -240,16 +198,10 @@ error: layout_of(C) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 1,
},
pref: Align {
pow2: 1,
},
},
size: Size {
raw: 2,
abi: Align(2 bytes),
pref: Align(2 bytes),
},
size: Size(2 bytes),
}
--> $DIR/hexagon-enum.rs:24:1
|
@ -259,9 +211,7 @@ LL | enum C { Chaenomeles = 256, }
error: layout_of(P) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -291,16 +241,10 @@ error: layout_of(P) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 4,
abi: Align(4 bytes),
pref: Align(4 bytes),
},
size: Size(4 bytes),
},
],
},
@ -315,9 +259,7 @@ error: layout_of(P) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I32,
false,
@ -326,16 +268,10 @@ error: layout_of(P) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 4,
abi: Align(4 bytes),
pref: Align(4 bytes),
},
size: Size(4 bytes),
}
--> $DIR/hexagon-enum.rs:28:1
|
@ -345,9 +281,7 @@ LL | enum P { Peach = 0x1000_0000isize, }
error: layout_of(T) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -377,16 +311,10 @@ error: layout_of(T) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 4,
abi: Align(4 bytes),
pref: Align(4 bytes),
},
size: Size(4 bytes),
},
],
},
@ -401,9 +329,7 @@ error: layout_of(T) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I32,
true,
@ -412,16 +338,10 @@ error: layout_of(T) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 4,
abi: Align(4 bytes),
pref: Align(4 bytes),
},
size: Size(4 bytes),
}
--> $DIR/hexagon-enum.rs:34:1
|

4
src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
View File

@ -1,10 +1,10 @@
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/homogeneous-aggr-zero-sized-c-struct.rs:22:1
|
LL | pub type TestMiddle = Middle;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/homogeneous-aggr-zero-sized-c-struct.rs:33:1
|
LL | pub type TestFinal = Final;

15
src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
View File

@ -17,8 +17,7 @@ pub struct WithPhantomData {
pub _unit: std::marker::PhantomData<()>,
}
pub struct EmptyRustStruct {
}
pub struct EmptyRustStruct {}
#[repr(C)]
pub struct WithEmptyRustStruct {
@ -52,22 +51,22 @@ pub struct WithEmptyRustEnum {
#[rustc_layout(homogeneous_aggregate)]
pub type Test1 = BaseCase;
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
#[rustc_layout(homogeneous_aggregate)]
pub type Test2 = WithPhantomData;
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
#[rustc_layout(homogeneous_aggregate)]
pub type Test3 = WithEmptyRustStruct;
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
#[rustc_layout(homogeneous_aggregate)]
pub type Test4 = WithTransitivelyEmptyRustStruct;
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
#[rustc_layout(homogeneous_aggregate)]
pub type Test5 = WithEmptyRustEnum;
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
fn main() { }
fn main() {}

20
src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
View File

@ -1,29 +1,29 @@
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:54:1
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:53:1
|
LL | pub type Test1 = BaseCase;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:58:1
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:57:1
|
LL | pub type Test2 = WithPhantomData;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:62:1
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:61:1
|
LL | pub type Test3 = WithEmptyRustStruct;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:66:1
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:65:1
|
LL | pub type Test4 = WithTransitivelyEmptyRustStruct;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:70:1
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:69:1
|
LL | pub type Test5 = WithEmptyRustEnum;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2
src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs
View File

@ -1,4 +1,4 @@
// normalize-stderr-test "pref: Align \{\n *pow2: [1-3],\n *\}" -> "pref: $$PREF_ALIGN"
// normalize-stderr-test "pref: Align\([1-8] bytes\)" -> "pref: $$PREF_ALIGN"
#![crate_type = "lib"]
#![feature(rustc_attrs)]

220
src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
View File

@ -1,9 +1,7 @@
error: layout_of(MissingPayloadField) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -23,9 +21,7 @@ error: layout_of(MissingPayloadField) = Layout {
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 1,
},
Size(1 bytes),
],
memory_index: [
0,
@ -39,14 +35,10 @@ error: layout_of(MissingPayloadField) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
},
Layout {
fields: Arbitrary {
@ -61,14 +53,10 @@ error: layout_of(MissingPayloadField) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 1,
},
size: Size(1 bytes),
},
],
},
@ -89,9 +77,7 @@ error: layout_of(MissingPayloadField) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -100,14 +86,10 @@ error: layout_of(MissingPayloadField) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
}
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:16:1
|
@ -120,9 +102,7 @@ LL | | }
error: layout_of(CommonPayloadField) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -142,9 +122,7 @@ error: layout_of(CommonPayloadField) = Layout {
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 1,
},
Size(1 bytes),
],
memory_index: [
0,
@ -158,21 +136,15 @@ error: layout_of(CommonPayloadField) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
},
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 1,
},
Size(1 bytes),
],
memory_index: [
0,
@ -186,14 +158,10 @@ error: layout_of(CommonPayloadField) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
},
],
},
@ -215,9 +183,7 @@ error: layout_of(CommonPayloadField) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -226,14 +192,10 @@ error: layout_of(CommonPayloadField) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
}
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:25:1
|
@ -246,9 +208,7 @@ LL | | }
error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -268,9 +228,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 1,
},
Size(1 bytes),
],
memory_index: [
0,
@ -284,21 +242,15 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
},
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 1,
},
Size(1 bytes),
],
memory_index: [
0,
@ -312,14 +264,10 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
},
],
},
@ -340,9 +288,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -351,14 +297,10 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
}
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:33:1
|
@ -371,9 +313,7 @@ LL | | }
error: layout_of(NicheFirst) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -397,12 +337,8 @@ error: layout_of(NicheFirst) = Layout {
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size {
raw: 1,
},
Size(0 bytes),
Size(1 bytes),
],
memory_index: [
0,
@ -430,9 +366,7 @@ error: layout_of(NicheFirst) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -441,14 +375,10 @@ error: layout_of(NicheFirst) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
},
Layout {
fields: Arbitrary {
@ -463,14 +393,10 @@ error: layout_of(NicheFirst) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 0,
},
size: Size(0 bytes),
},
Layout {
fields: Arbitrary {
@ -485,14 +411,10 @@ error: layout_of(NicheFirst) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 0,
},
size: Size(0 bytes),
},
],
},
@ -513,9 +435,7 @@ error: layout_of(NicheFirst) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -524,14 +444,10 @@ error: layout_of(NicheFirst) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
}
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:41:1
|
@ -545,9 +461,7 @@ LL | | }
error: layout_of(NicheSecond) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 1,
},
Size(1 bytes),
],
memory_index: [
0,
@ -571,12 +485,8 @@ error: layout_of(NicheSecond) = Layout {
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size {
raw: 1,
},
Size(0 bytes),
Size(1 bytes),
],
memory_index: [
0,
@ -604,9 +514,7 @@ error: layout_of(NicheSecond) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 1,
},
offset: Size(1 bytes),
value: Int(
I8,
false,
@ -615,14 +523,10 @@ error: layout_of(NicheSecond) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
},
Layout {
fields: Arbitrary {
@ -637,14 +541,10 @@ error: layout_of(NicheSecond) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 0,
},
size: Size(0 bytes),
},
Layout {
fields: Arbitrary {
@ -659,14 +559,10 @@ error: layout_of(NicheSecond) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 0,
},
size: Size(0 bytes),
},
],
},
@ -687,9 +583,7 @@ error: layout_of(NicheSecond) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 1,
},
offset: Size(1 bytes),
value: Int(
I8,
false,
@ -698,14 +592,10 @@ error: layout_of(NicheSecond) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
},
size: Size(2 bytes),
}
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:50:1
|

160
src/test/ui/layout/thumb-enum.stderr
View File

@ -1,9 +1,7 @@
error: layout_of(A) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -33,16 +31,10 @@ error: layout_of(A) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 1,
abi: Align(1 bytes),
pref: Align(4 bytes),
},
size: Size(1 bytes),
},
],
},
@ -57,9 +49,7 @@ error: layout_of(A) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -68,16 +58,10 @@ error: layout_of(A) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 1,
abi: Align(1 bytes),
pref: Align(4 bytes),
},
size: Size(1 bytes),
}
--> $DIR/thumb-enum.rs:16:1
|
@ -87,9 +71,7 @@ LL | enum A { Apple }
error: layout_of(B) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -119,16 +101,10 @@ error: layout_of(B) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 1,
abi: Align(1 bytes),
pref: Align(4 bytes),
},
size: Size(1 bytes),
},
],
},
@ -143,9 +119,7 @@ error: layout_of(B) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I8,
false,
@ -154,16 +128,10 @@ error: layout_of(B) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 1,
abi: Align(1 bytes),
pref: Align(4 bytes),
},
size: Size(1 bytes),
}
--> $DIR/thumb-enum.rs:20:1
|
@ -173,9 +141,7 @@ LL | enum B { Banana = 255, }
error: layout_of(C) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -205,16 +171,10 @@ error: layout_of(C) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 1,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 2,
abi: Align(2 bytes),
pref: Align(4 bytes),
},
size: Size(2 bytes),
},
],
},
@ -229,9 +189,7 @@ error: layout_of(C) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I16,
false,
@ -240,16 +198,10 @@ error: layout_of(C) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 1,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 2,
abi: Align(2 bytes),
pref: Align(4 bytes),
},
size: Size(2 bytes),
}
--> $DIR/thumb-enum.rs:24:1
|
@ -259,9 +211,7 @@ LL | enum C { Chaenomeles = 256, }
error: layout_of(P) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -291,16 +241,10 @@ error: layout_of(P) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 4,
abi: Align(4 bytes),
pref: Align(4 bytes),
},
size: Size(4 bytes),
},
],
},
@ -315,9 +259,7 @@ error: layout_of(P) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I32,
false,
@ -326,16 +268,10 @@ error: layout_of(P) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 4,
abi: Align(4 bytes),
pref: Align(4 bytes),
},
size: Size(4 bytes),
}
--> $DIR/thumb-enum.rs:28:1
|
@ -345,9 +281,7 @@ LL | enum P { Peach = 0x1000_0000isize, }
error: layout_of(T) = Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
Size(0 bytes),
],
memory_index: [
0,
@ -377,16 +311,10 @@ error: layout_of(T) = Layout {
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 4,
abi: Align(4 bytes),
pref: Align(4 bytes),
},
size: Size(4 bytes),
},
],
},
@ -401,9 +329,7 @@ error: layout_of(T) = Layout {
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
offset: Size(0 bytes),
value: Int(
I32,
true,
@ -412,16 +338,10 @@ error: layout_of(T) = Layout {
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 2,
},
pref: Align {
pow2: 2,
},
},
size: Size {
raw: 4,
abi: Align(4 bytes),
pref: Align(4 bytes),
},
size: Size(4 bytes),
}
--> $DIR/thumb-enum.rs:34:1
|

8
src/test/ui/layout/zero-sized-array-union.stderr
View File

@ -1,22 +1,22 @@
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/zero-sized-array-union.rs:59:1
|
LL | type TestBaz1 = Baz1;
| ^^^^^^^^^^^^^^^^^^^^^
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/zero-sized-array-union.rs:70:1
|
LL | type TestBaz2 = Baz2;
| ^^^^^^^^^^^^^^^^^^^^^
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/zero-sized-array-union.rs:81:1
|
LL | type TestBaz3 = Baz3;
| ^^^^^^^^^^^^^^^^^^^^^
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
--> $DIR/zero-sized-array-union.rs:92:1
|
LL | type TestBaz4 = Baz4;