mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-28 17:53:56 +00:00
Auto merge of #91164 - Badel2:usefulness-stack-overflow, r=davidtwco
Fix stack overflow in `usefulness.rs` Fix #88747 Applied the suggestion from `@nbdd0121,` not sure if this has any drawbacks. The first call to `ensure_sufficient_stack` is not needed to fix the test case, but I added it to be safe.
This commit is contained in:
commit
454cc5fb86
@ -289,6 +289,7 @@ use super::deconstruct_pat::{Constructor, DeconstructedPat, Fields, SplitWildcar
|
||||
use rustc_data_structures::captures::Captures;
|
||||
|
||||
use rustc_arena::TypedArena;
|
||||
use rustc_data_structures::stack::ensure_sufficient_stack;
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_hir::HirId;
|
||||
use rustc_middle::ty::{self, Ty, TyCtxt};
|
||||
@ -808,8 +809,9 @@ fn is_useful<'p, 'tcx>(
|
||||
// We try each or-pattern branch in turn.
|
||||
let mut matrix = matrix.clone();
|
||||
for v in v.expand_or_pat() {
|
||||
let usefulness =
|
||||
is_useful(cx, &matrix, &v, witness_preference, hir_id, is_under_guard, false);
|
||||
let usefulness = ensure_sufficient_stack(|| {
|
||||
is_useful(cx, &matrix, &v, witness_preference, hir_id, is_under_guard, false)
|
||||
});
|
||||
ret.extend(usefulness);
|
||||
// If pattern has a guard don't add it to the matrix.
|
||||
if !is_under_guard {
|
||||
@ -840,8 +842,9 @@ fn is_useful<'p, 'tcx>(
|
||||
// We cache the result of `Fields::wildcards` because it is used a lot.
|
||||
let spec_matrix = start_matrix.specialize_constructor(pcx, &ctor);
|
||||
let v = v.pop_head_constructor(cx, &ctor);
|
||||
let usefulness =
|
||||
is_useful(cx, &spec_matrix, &v, witness_preference, hir_id, is_under_guard, false);
|
||||
let usefulness = ensure_sufficient_stack(|| {
|
||||
is_useful(cx, &spec_matrix, &v, witness_preference, hir_id, is_under_guard, false)
|
||||
});
|
||||
let usefulness = usefulness.apply_constructor(pcx, start_matrix, &ctor);
|
||||
|
||||
// When all the conditions are met we have a match with a `non_exhaustive` enum
|
||||
|
14
src/test/ui/pattern/usefulness/issue-88747.rs
Normal file
14
src/test/ui/pattern/usefulness/issue-88747.rs
Normal file
@ -0,0 +1,14 @@
|
||||
// check-pass: this used to be a stack overflow because of recursion in `usefulness.rs`
|
||||
|
||||
macro_rules! long_tuple_arg {
|
||||
([$($t:tt)*]#$($h:tt)*) => {
|
||||
long_tuple_arg!{[$($t)*$($t)*]$($h)*}
|
||||
};
|
||||
([$([$t:tt $y:tt])*]) => {
|
||||
pub fn _f(($($t,)*): ($($y,)*)) {}
|
||||
}
|
||||
}
|
||||
|
||||
long_tuple_arg!{[[_ u8]]########## ###}
|
||||
|
||||
fn main() {}
|
Loading…
Reference in New Issue
Block a user