diff options
| author | bors <bors@rust-lang.org> | 2024-08-29 16:15:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-29 16:15:41 +0000 |
| commit | 784d444733d65c3d305ce5edcbb41e3d0d0aee2e (patch) | |
| tree | 6e516eef81a00ce51159aec39400f2371204e2e2 /compiler/rustc_mir_transform/src | |
| parent | 6cf068db566de080dfa7ed24a216ea3aed2b98ce (diff) | |
| parent | 950437a035aa81cf2af3d8aebdf8d9b294c54395 (diff) | |
| download | rust-784d444733d65c3d305ce5edcbb41e3d0d0aee2e.tar.gz rust-784d444733d65c3d305ce5edcbb41e3d0d0aee2e.zip | |
Auto merge of #129714 - saethlin:half-a-recursion, r=compiler-errors
Use a reduced recursion limit in the MIR inliner's cycle breaker This probably papers over https://github.com/rust-lang/rust/issues/128887, but primarily I'm opening this PR because multiple compiler people have thought about making this change which probably means it's a good idea. r? compiler-errors
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/inline/cycle.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/inline/cycle.rs b/compiler/rustc_mir_transform/src/inline/cycle.rs index 56e8905bead..c65cc993b19 100644 --- a/compiler/rustc_mir_transform/src/inline/cycle.rs +++ b/compiler/rustc_mir_transform/src/inline/cycle.rs @@ -135,6 +135,14 @@ pub(crate) fn mir_callgraph_reachable<'tcx>( } false } + // FIXME(-Znext-solver): Remove this hack when trait solver overflow can return an error. + // In code like that pointed out in #128887, the type complexity we ask the solver to deal with + // grows as we recurse into the call graph. If we use the same recursion limit here and in the + // solver, the solver hits the limit first and emits a fatal error. But if we use a reduced + // limit, we will hit the limit first and give up on looking for inlining. And in any case, + // the default recursion limits are quite generous for us. If we need to recurse 64 times + // into the call graph, we're probably not going to find any useful MIR inlining. + let recursion_limit = tcx.recursion_limit() / 2; process( tcx, param_env, @@ -143,7 +151,7 @@ pub(crate) fn mir_callgraph_reachable<'tcx>( &mut Vec::new(), &mut FxHashSet::default(), &mut FxHashMap::default(), - tcx.recursion_limit(), + recursion_limit, ) } |
