bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

safe transmute: tweak tracing

Browse source 
ref: https://github.com/rust-lang/rust/pull/92268#discussion_r925246903
ref: https://github.com/rust-lang/rust/pull/92268#discussion_r925250811
ref: https://github.com/rust-lang/rust/pull/92268#discussion_r925255782
This commit is contained in:
Jack Wrenn 2022-07-21 17:28:24 +00:00
parent 0fa70c3b12
commit c0d0ce95eb
5 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_transmute/src/layout/dfa.rs
View file

@ -103,7 +103,7 @@ where
Self { transitions, start, accepting }
}
#[tracing::instrument]
#[instrument(level = "DEBUG")]
#[cfg_attr(feature = "rustc", allow(rustc::potential_query_instability))]
pub(crate) fn from_nfa(nfa: Nfa<R>) -> Self {
let Nfa { transitions: nfa_transitions, start: nfa_start, accepting: nfa_accepting } = nfa;

16
compiler/rustc_transmute/src/layout/tree.rs
View file

@ -76,7 +76,6 @@ where
}
/// A `Tree` whose layout is entirely padding of the given width.
#[tracing::instrument]
pub(crate) fn padding(width_in_bytes: usize) -> Self {
Self::Seq(vec![Self::uninit(); width_in_bytes])
}
@ -316,10 +315,7 @@ pub(crate) mod rustc {
tcx,
)?,
AdtKind::Enum => {
tracing::trace!(
adt_def = ?adt_def,
"treeifying enum"
);
tracing::trace!(?adt_def, "treeifying enum");
let mut tree = Tree::uninhabited();
for (idx, discr) in adt_def.discriminants(tcx) {
@ -398,13 +394,13 @@ pub(crate) mod rustc {
// The layout of the variant is prefixed by the discriminant, if any.
if let Some(discr) = discr {
tracing::trace!(discr = ?discr, "treeifying discriminant");
tracing::trace!(?discr, "treeifying discriminant");
let discr_layout = alloc::Layout::from_size_align(
layout_summary.discriminant_size,
clamp(layout_summary.discriminant_align),
)
.unwrap();
tracing::trace!(discr_layout = ?discr_layout, "computed discriminant layout");
tracing::trace!(?discr_layout, "computed discriminant layout");
variant_layout = variant_layout.extend(discr_layout).unwrap().0;
tree = tree.then(Self::from_disr(discr, tcx, layout_summary.discriminant_size));
}
@ -469,11 +465,7 @@ pub(crate) mod rustc {
layout.align().abi.bytes().try_into().unwrap(),
)
.unwrap();
tracing::trace!(
ty = ?ty,
layout = ?layout,
"computed layout for type"
);
tracing::trace!(?ty, ?layout, "computed layout for type");
Ok(layout)
}
}