about summary refs log tree commit diff
path: root/compiler/rustc_mir_transform/src/inline
diff options
context:
space:
mode:
authorBen Kimock <kimockb@gmail.com>2024-08-28 19:36:46 -0400
committerBen Kimock <kimockb@gmail.com>2024-08-28 19:52:23 -0400
commit950437a035aa81cf2af3d8aebdf8d9b294c54395 (patch)
treef1915dbc8d6db900455c3c3b5834435d1a67fc68 /compiler/rustc_mir_transform/src/inline
parent100fde5246bf56f22fb5cc85374dd841296fce0e (diff)
downloadrust-950437a035aa81cf2af3d8aebdf8d9b294c54395.tar.gz
rust-950437a035aa81cf2af3d8aebdf8d9b294c54395.zip
Use a reduced recursion limit in the MIR inliner's cycle breaker
Diffstat (limited to 'compiler/rustc_mir_transform/src/inline')
-rw-r--r--compiler/rustc_mir_transform/src/inline/cycle.rs10
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,
     )
 }