Remove unneeded tracing in step.rs

Author: Stypox

compiler/rustc_const_eval/src/interpret/step.rs

@@ -76,8 +76,14 @@ 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> {
-        let _span = enter_trace_span!(M, step::eval_statement, stmt = ?stmt, tracing_separate_thread = Empty)
-            .or_if_tracing_disabled(|| info!(?stmt));
+        let _span = enter_trace_span!(
+            M,
+            step::eval_statement,
+            stmt = ?stmt.kind,
+            span = ?stmt.source_info.span,
+            tracing_separate_thread = Empty,
+        )
+        .or_if_tracing_disabled(|| info!(stmt = ?stmt.kind));
 
         use rustc_middle::mir::StatementKind::*;
 
@@ -162,12 +168,6 @@ 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.
@@ -392,8 +392,6 @@ 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.
@@ -432,13 +430,6 @@ 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()
@@ -474,8 +465,14 @@ 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)
-            .or_if_tracing_disabled(|| info!("{:?}", terminator.kind));
+        let _span = enter_trace_span!(
+            M,
+            step::eval_terminator,
+            terminator = ?terminator.kind,
+            span = ?terminator.source_info.span,
+            tracing_separate_thread = Empty,
+        )
+        .or_if_tracing_disabled(|| info!(terminator = ?terminator.kind));
 
         use rustc_middle::mir::TerminatorKind::*;
         match terminator.kind {