Allow inlining into coroutines.

Author: cjgillot

compiler/rustc_mir_transform/src/inline.rs

@@ -121,8 +121,6 @@ trait Inliner<'tcx> {
         callee_attrs: &CodegenFnAttrs,
     ) -> Result<(), &'static str>;
 
-    fn check_caller_mir_body(&self, body: &Body<'tcx>) -> bool;
-
     /// Returns inlining decision that is based on the examination of callee MIR body.
     /// Assumes that codegen attributes have been checked for compatibility already.
     fn check_callee_mir_body(
@@ -196,10 +194,6 @@ impl<'tcx> Inliner<'tcx> for ForceInliner<'tcx> {
         Ok(())
     }
 
-    fn check_caller_mir_body(&self, _: &Body<'tcx>) -> bool {
-        true
-    }
-
     #[instrument(level = "debug", skip(self, callee_body))]
     fn check_callee_mir_body(
         &self,
@@ -346,17 +340,6 @@ impl<'tcx> Inliner<'tcx> for NormalInliner<'tcx> {
         }
     }
 
-    fn check_caller_mir_body(&self, body: &Body<'tcx>) -> bool {
-        // Avoid inlining into coroutines, 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.coroutine.is_some() {
-            return false;
-        }
-
-        true
-    }
-
     #[instrument(level = "debug", skip(self, callee_body))]
     fn check_callee_mir_body(
         &self,
@@ -499,10 +482,6 @@ fn inline<'tcx, T: Inliner<'tcx>>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) -> b
     }
 
     let mut inliner = T::new(tcx, def_id, body);
-    if !inliner.check_caller_mir_body(body) {
-        return false;
-    }
-
     let blocks = START_BLOCK..body.basic_blocks.next_index();
     process_blocks(&mut inliner, body, blocks);
     inliner.changed()
@@ -771,11 +750,12 @@ fn check_mir_is_available<'tcx, I: Inliner<'tcx>>(
         && !inliner
             .tcx()
             .is_lang_item(inliner.tcx().parent(caller_def_id), rustc_hir::LangItem::FnOnce)
+        // The caller may be a shim.
+        && let Some(caller_def_id) = caller_def_id.as_local()
     {
         // If we know for sure that the function we're calling will itself try to
         // call us, then we avoid inlining that function.
-        if inliner.tcx().mir_callgraph_cyclic(caller_def_id.expect_local()).contains(&callee_def_id)
-        {
+        if inliner.tcx().mir_callgraph_cyclic(caller_def_id).contains(&callee_def_id) {
             debug!("query cycle avoidance");
             return Err("caller might be reachable from callee");
         }

tests/coverage/await_ready.cov-map

@@ -8,15 +8,13 @@ Number of file 0 mappings: 1
 Highest counter ID seen: c0
 
 Function name: await_ready::await_ready::{closure#0}
-Raw bytes (21): 0x[01, 01, 01, 05, 09, 03, 01, 0e, 1e, 00, 1f, 01, 02, 05, 01, 0f, 02, 02, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 0e, 1e, 00, 1f, 01, 02, 05, 01, 0f, 05, 02, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/await_ready.rs
-Number of expressions: 1
-- expression 0 operands: lhs = Counter(1), rhs = Counter(2)
+Number of expressions: 0
 Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 14, 30) to (start + 0, 31)
 - Code(Counter(0)) at (prev + 2, 5) to (start + 1, 15)
-- Code(Expression(0, Sub)) at (prev + 2, 1) to (start + 0, 2)
-    = (c1 - c2)
-Highest counter ID seen: c0
+- Code(Counter(1)) at (prev + 2, 1) to (start + 0, 2)
+Highest counter ID seen: c1