bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

make Size and Align debug-printing a bit more compact

Browse source
This commit is contained in:
Ralf Jung 2022-04-30 18:30:11 +02:00
parent 9714e139ff
commit bd31ba045d
11 changed files with 206 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

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/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;