bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Move generator check earlier in inlining.

Browse source
This commit is contained in:
Camille GILLOT 2021-12-13 19:25:36 +01:00
parent 4a66a704b2
commit d48dbdc080
3 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_mir_transform/src/inline.rs
View file

@ -68,6 +68,12 @@ fn inline<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) -> bool {
if body.source.promoted.is_some() {
return false;
}
// Avoid inlining into generators, since their `optimized_mir` is used for layout computation,
// which can create a cycle, even when no attempt is made to inline the function in the other
// direction.
if body.generator.is_some() {
return false;
}
let mut this = Inliner {
tcx,
@ -202,14 +208,6 @@ impl<'tcx> Inliner<'tcx> {
if let Some(callee_def_id) = callee.def_id().as_local() {
let callee_hir_id = self.tcx.hir().local_def_id_to_hir_id(callee_def_id);
// Avoid inlining into generators,
// since their `optimized_mir` is used for layout computation, which can
// create a cycle, even when no attempt is made to inline the function
// in the other direction.
if caller_body.generator.is_some() {
return Err("local generator (query cycle avoidance)");
}
// Avoid a cycle here by only using `instance_mir` only if we have
// a lower `HirId` than the callee. This ensures that the callee will
// not inline us. This trick only works without incremental compilation.