Add tracing calls to step.rs

Author: Stypox

compiler/rustc_const_eval/src/interpret/step.rs

@@ -9,13 +9,14 @@ use rustc_middle::ty::{self, Instance, Ty};
 use rustc_middle::{bug, mir, span_bug};
 use rustc_span::source_map::Spanned;
 use rustc_target::callconv::FnAbi;
+use tracing::field::Empty;
 use tracing::{info, instrument, trace};
 
 use super::{
     FnArg, FnVal, ImmTy, Immediate, InterpCx, InterpResult, Machine, MemPlaceMeta, PlaceTy,
     Projectable, Scalar, interp_ok, throw_ub, throw_unsup_format,
 };
-use crate::util;
+use crate::{enter_trace_span, util};
 
 struct EvaluatedCalleeAndArgs<'tcx, M: Machine<'tcx>> {
     callee: FnVal<'tcx, M::ExtraFnVal>,
@@ -74,7 +75,8 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
     ///
     /// This does NOT move the statement counter forward, the caller has to do that!
     pub fn eval_statement(&mut self, stmt: &mir::Statement<'tcx>) -> InterpResult<'tcx> {
-        info!("{:?}", stmt);
+        let _span = enter_trace_span!(M, step::eval_statement, stmt = ?stmt, tracing_separate_thread = Empty);
+        info!(?stmt);
 
         use rustc_middle::mir::StatementKind::*;
 
@@ -159,6 +161,12 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
         rvalue: &mir::Rvalue<'tcx>,
         place: mir::Place<'tcx>,
     ) -> InterpResult<'tcx> {
+        let _span = enter_trace_span!(
+            M,
+            step::eval_rvalue_into_place,
+            ?rvalue,
+            tracing_separate_thread = Empty
+        );
         let dest = self.eval_place(place)?;
         // FIXME: ensure some kind of non-aliasing between LHS and RHS?
         // Also see https://github.com/rust-lang/rust/issues/68364.
@@ -383,6 +391,8 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
         &self,
         op: &mir::Operand<'tcx>,
     ) -> InterpResult<'tcx, FnArg<'tcx, M::Provenance>> {
+        let _span =
+            enter_trace_span!(M, step::eval_fn_call_argument, ?op, tracing_separate_thread = Empty);
         interp_ok(match op {
             mir::Operand::Copy(_) | mir::Operand::Constant(_) => {
                 // Make a regular copy.
@@ -421,6 +431,13 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
         func: &mir::Operand<'tcx>,
         args: &[Spanned<mir::Operand<'tcx>>],
     ) -> InterpResult<'tcx, EvaluatedCalleeAndArgs<'tcx, M>> {
+        let _span = enter_trace_span!(
+            M,
+            step::eval_callee_and_args,
+            ?func,
+            ?args,
+            tracing_separate_thread = Empty
+        );
         let func = self.eval_operand(func, None)?;
         let args = args
             .iter()
@@ -456,6 +473,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
     }
 
     fn eval_terminator(&mut self, terminator: &mir::Terminator<'tcx>) -> InterpResult<'tcx> {
+        let _span = enter_trace_span!(M, step::eval_terminator, terminator = ?terminator.kind, tracing_separate_thread = Empty);
         info!("{:?}", terminator.kind);
 
         use rustc_middle::mir::TerminatorKind::*;