From 9437d227905267358663609ecddad97eb9f587f4 Mon Sep 17 00:00:00 2001 From: Maximilian Azendorf Date: Sat, 14 Mar 2026 23:51:44 +0100 Subject: [PATCH 1/3] Avoid stack overflow in FindExprBySpan --- .../src/error_reporting/traits/mod.rs | 23 +++++++++++-------- tests/ui/try-trait/issue-153583.rs | 7 ++++++ tests/ui/try-trait/issue-153583.stderr | 11 +++++++++ 3 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 tests/ui/try-trait/issue-153583.rs create mode 100644 tests/ui/try-trait/issue-153583.stderr diff --git a/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs b/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs index bda0c4fa2c6f..69afa4f20b3e 100644 --- a/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs +++ b/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs @@ -8,6 +8,7 @@ use std::{fmt, iter}; use rustc_data_structures::fx::{FxIndexMap, FxIndexSet}; +use rustc_data_structures::stack::ensure_sufficient_stack; use rustc_data_structures::unord::UnordSet; use rustc_errors::{Applicability, Diag, E0038, E0276, MultiSpan, struct_span_code_err}; use rustc_hir::def_id::{DefId, LOCAL_CRATE, LocalDefId}; @@ -74,18 +75,20 @@ fn maybe_tcx(&mut self) -> Self::MaybeTyCtxt { } fn visit_expr(&mut self, ex: &'v hir::Expr<'v>) { - if self.span == ex.span { - self.result = Some(ex); - } else { - if let hir::ExprKind::Closure(..) = ex.kind - && self.include_closures - && let closure_header_sp = self.span.with_hi(ex.span.hi()) - && closure_header_sp == ex.span - { + ensure_sufficient_stack(|| { + if self.span == ex.span { self.result = Some(ex); + } else { + if let hir::ExprKind::Closure(..) = ex.kind + && self.include_closures + && let closure_header_sp = self.span.with_hi(ex.span.hi()) + && closure_header_sp == ex.span + { + self.result = Some(ex); + } + hir::intravisit::walk_expr(self, ex); } - hir::intravisit::walk_expr(self, ex); - } + }); } fn visit_ty(&mut self, ty: &'v hir::Ty<'v, AmbigArg>) { diff --git a/tests/ui/try-trait/issue-153583.rs b/tests/ui/try-trait/issue-153583.rs new file mode 100644 index 000000000000..9872d1bbc817 --- /dev/null +++ b/tests/ui/try-trait/issue-153583.rs @@ -0,0 +1,7 @@ +// Regression test for #153583: deeply nested `?` operators should not overflow +// the error-reporting visitor. + +fn main() -> Result<(), ()> { + 0????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????; //~ ERROR the `?` operator can only be applied to values that implement `Try` + Ok(()) +} diff --git a/tests/ui/try-trait/issue-153583.stderr b/tests/ui/try-trait/issue-153583.stderr new file mode 100644 index 000000000000..cbeeaa348024 --- /dev/null +++ b/tests/ui/try-trait/issue-153583.stderr @@ -0,0 +1,11 @@ +error[E0277]: the `?` operator can only be applied to values that implement `Try` + --> $DIR/issue-153583.rs:5:5 + | +LL | 0???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????... + | ^^ the `?` operator cannot be applied to type `{integer}` + | + = help: the nightly-only, unstable trait `Try` is not implemented for `{integer}` + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0277`. From cf6ea02d28f626dd37dc3d535a0a0e9cd89fbe1e Mon Sep 17 00:00:00 2001 From: Maximilian Azendorf Date: Sun, 15 Mar 2026 00:06:27 +0100 Subject: [PATCH 2/3] Add tidy exemption for issue-153583 test --- tests/ui/try-trait/issue-153583.rs | 1 + tests/ui/try-trait/issue-153583.stderr | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/ui/try-trait/issue-153583.rs b/tests/ui/try-trait/issue-153583.rs index 9872d1bbc817..cc00866fa329 100644 --- a/tests/ui/try-trait/issue-153583.rs +++ b/tests/ui/try-trait/issue-153583.rs @@ -1,5 +1,6 @@ // Regression test for #153583: deeply nested `?` operators should not overflow // the error-reporting visitor. +// ignore-tidy-linelength fn main() -> Result<(), ()> { 0????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????; //~ ERROR the `?` operator can only be applied to values that implement `Try` diff --git a/tests/ui/try-trait/issue-153583.stderr b/tests/ui/try-trait/issue-153583.stderr index cbeeaa348024..8a732f8a882e 100644 --- a/tests/ui/try-trait/issue-153583.stderr +++ b/tests/ui/try-trait/issue-153583.stderr @@ -1,5 +1,5 @@ error[E0277]: the `?` operator can only be applied to values that implement `Try` - --> $DIR/issue-153583.rs:5:5 + --> $DIR/issue-153583.rs:6:5 | LL | 0???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????... | ^^ the `?` operator cannot be applied to type `{integer}` From 572bdae107b69ed37a1f466367d859a99228b351 Mon Sep 17 00:00:00 2001 From: Maximilian Azendorf Date: Sun, 15 Mar 2026 00:19:17 +0100 Subject: [PATCH 3/3] Rename issue-153583 UI test --- .../{issue-153583.rs => deep-try-chain-issue-153583.rs} | 0 .../{issue-153583.stderr => deep-try-chain-issue-153583.stderr} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/ui/try-trait/{issue-153583.rs => deep-try-chain-issue-153583.rs} (100%) rename tests/ui/try-trait/{issue-153583.stderr => deep-try-chain-issue-153583.stderr} (91%) diff --git a/tests/ui/try-trait/issue-153583.rs b/tests/ui/try-trait/deep-try-chain-issue-153583.rs similarity index 100% rename from tests/ui/try-trait/issue-153583.rs rename to tests/ui/try-trait/deep-try-chain-issue-153583.rs diff --git a/tests/ui/try-trait/issue-153583.stderr b/tests/ui/try-trait/deep-try-chain-issue-153583.stderr similarity index 91% rename from tests/ui/try-trait/issue-153583.stderr rename to tests/ui/try-trait/deep-try-chain-issue-153583.stderr index 8a732f8a882e..d3794136202b 100644 --- a/tests/ui/try-trait/issue-153583.stderr +++ b/tests/ui/try-trait/deep-try-chain-issue-153583.stderr @@ -1,5 +1,5 @@ error[E0277]: the `?` operator can only be applied to values that implement `Try` - --> $DIR/issue-153583.rs:6:5 + --> $DIR/deep-try-chain-issue-153583.rs:6:5 | LL | 0???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????... | ^^ the `?` operator cannot be applied to type `{integer}`