Skip redundant frames in const recursion errors

compiler/rustc_const_eval/messages.ftl

@@ -100,7 +100,7 @@ const_eval_fn_ptr_call =
     function pointers need an RFC before allowed to be called in {const_eval_const_context}s
 const_eval_frame_note = {$times ->
     [0] {const_eval_frame_note_inner}
-    *[other] [... {$times} additional calls {const_eval_frame_note_inner} ...]
+    *[other] [... {$times} additional calls ...] {const_eval_frame_note_inner}
 }
 
 const_eval_frame_note_inner = inside {$where_ ->

compiler/rustc_const_eval/src/const_eval/error.rs

@@ -1,5 +1,6 @@
 use std::mem;
 
+use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::{DiagArgName, DiagArgValue, DiagMessage, Diagnostic, IntoDiagArg};
 use rustc_middle::mir::AssertKind;
 use rustc_middle::mir::interpret::{Provenance, ReportedErrorInfo};
@@ -9,7 +10,7 @@ use rustc_middle::ty::{ConstInt, TyCtxt};
 use rustc_span::{Span, Symbol};
 
 use super::CompileTimeMachine;
-use crate::errors::{self, FrameNote, ReportErrorExt};
+use crate::errors::{FrameNote, ReportErrorExt};
 use crate::interpret::{
     ErrorHandled, Frame, InterpErrorInfo, InterpErrorKind, MachineStopType, err_inval,
     err_machine_stop,
@@ -68,7 +69,7 @@ impl<'tcx> Into<InterpErrorInfo<'tcx>> for ConstEvalErrKind {
 pub fn get_span_and_frames<'tcx>(
     tcx: TyCtxtAt<'tcx>,
     stack: &[Frame<'tcx, impl Provenance, impl Sized>],
-) -> (Span, Vec<errors::FrameNote>) {
+) -> (Span, Vec<FrameNote>) {
     let mut stacktrace = Frame::generate_stacktrace_from_stack(stack);
     // Filter out `requires_caller_location` frames.
     stacktrace.retain(|frame| !frame.instance.def.requires_caller_location(*tcx));
@@ -79,8 +80,8 @@ pub fn get_span_and_frames<'tcx>(
     // Add notes to the backtrace. Don't print a single-line backtrace though.
     if stacktrace.len() > 1 {
         // Helper closure to print duplicated lines.
-        let mut add_frame = |mut frame: errors::FrameNote| {
-            frames.push(errors::FrameNote { times: 0, ..frame.clone() });
+        let mut add_frame = |mut frame: FrameNote| {
+            frames.push(FrameNote { times: 0, ..frame.clone() });
             // Don't print [... additional calls ...] if the number of lines is small
             if frame.times < 3 {
                 let times = frame.times;
@@ -91,21 +92,19 @@ pub fn get_span_and_frames<'tcx>(
             }
         };
 
-        let mut last_frame: Option<errors::FrameNote> = None;
+        let mut last_frame: Option<FrameNote> = None;
+        let mut seen = FxHashSet::default();
         for frame_info in &stacktrace {
             let frame = frame_info.as_note(*tcx);
             match last_frame.as_mut() {
-                Some(last_frame)
-                    if last_frame.span == frame.span
-                        && last_frame.where_ == frame.where_
-                        && last_frame.instance == frame.instance =>
-                {
+                Some(last_frame) if !seen.insert(frame.clone()) => {
                     last_frame.times += 1;
                 }
                 Some(last_frame) => {
                     add_frame(mem::replace(last_frame, frame));
                 }
                 None => {
+                    seen.insert(frame.clone());
                     last_frame = Some(frame);
                 }
             }
@@ -184,7 +183,7 @@ pub(super) fn lint<'tcx, L>(
     tcx: TyCtxtAt<'tcx>,
     machine: &CompileTimeMachine<'tcx>,
     lint: &'static rustc_session::lint::Lint,
-    decorator: impl FnOnce(Vec<errors::FrameNote>) -> L,
+    decorator: impl FnOnce(Vec<FrameNote>) -> L,
 ) where
     L: for<'a> rustc_errors::LintDiagnostic<'a, ()>,
 {

compiler/rustc_const_eval/src/errors.rs

@@ -279,7 +279,7 @@ pub(crate) struct NonConstImplNote {
     pub span: Span,
 }
 
-#[derive(Subdiagnostic, Clone)]
+#[derive(Subdiagnostic, Clone, PartialEq, Eq, Hash)]
 #[note(const_eval_frame_note)]
 pub struct FrameNote {
     #[primary_span]

tests/ui/consts/recursive.stderr

@@ -20,7 +20,7 @@ note: inside `f::<i32>`
    |
 LL |     f(x);
    |     ^^^^
-note: [... 126 additional calls inside `f::<i32>` ...]
+note: [... 126 additional calls ...] inside `f::<i32>`
   --> $DIR/recursive.rs:4:5
    |
 LL |     f(x);