bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Extend -Z print-type-sizes to distinguish generator upvars and locals from "normal" ADT fields.

Browse source
This commit is contained in:
Felix S. Klock II 2023-01-31 15:59:29 -05:00
parent a64ef7d07d
commit a37b3061fc
3 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
compiler/rustc_session/src/code_stats.rs
View file

@ -19,8 +19,26 @@ pub enum SizeKind {
Min,
}
#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
pub enum FieldKind {
AdtField,
Upvar,
GeneratorLocal,
}
impl std::fmt::Display for FieldKind {
fn fmt(&self, w: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
FieldKind::AdtField => { write!(w, "field") }
FieldKind::Upvar => { write!(w, "upvar") }
FieldKind::GeneratorLocal => { write!(w, "local") }
}
}
}
#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
pub struct FieldInfo {
pub kind: FieldKind,
pub name: Symbol,
pub offset: u64,
pub size: u64,
@ -145,7 +163,7 @@ impl CodeStats {
fields.sort_by_key(|f| (f.offset, f.size));
for field in fields {
let FieldInfo { ref name, offset, size, align } = field;
let FieldInfo { kind, ref name, offset, size, align } = field;
if offset > min_offset {
let pad = offset - min_offset;
@ -155,16 +173,16 @@ impl CodeStats {
if offset < min_offset {
// If this happens it's probably a union.
println!(
"print-type-size {indent}field `.{name}`: {size} bytes, \
"print-type-size {indent}{kind} `.{name}`: {size} bytes, \
offset: {offset} bytes, \
alignment: {align} bytes"
);
} else if info.packed || offset == min_offset {
println!("print-type-size {indent}field `.{name}`: {size} bytes");
println!("print-type-size {indent}{kind} `.{name}`: {size} bytes");
} else {
// Include field alignment in output only if it caused padding injection
println!(
"print-type-size {indent}field `.{name}`: {size} bytes, \
"print-type-size {indent}{kind} `.{name}`: {size} bytes, \
alignment: {align} bytes"
);
}

2
compiler/rustc_session/src/session.rs
View file

@ -1,6 +1,6 @@
use crate::cgu_reuse_tracker::CguReuseTracker;
use crate::code_stats::CodeStats;
pub use crate::code_stats::{DataTypeKind, FieldInfo, SizeKind, VariantInfo};
pub use crate::code_stats::{DataTypeKind, FieldInfo, FieldKind, SizeKind, VariantInfo};
use crate::config::Input;
use crate::config::{self, CrateType, InstrumentCoverage, OptLevel, OutputType, SwitchWithOptPath};
use crate::errors::{