Use mir_promoted

Author: saethlin

compiler/rustc_mir_transform/src/lib.rs

@@ -331,8 +331,6 @@ fn mir_promoted(
         _ => ConstQualifs::default(),
     };
 
-    tcx.ensure_with_value().mir_flags(def);
-
     // the `by_move_body` query uses the raw mir, so make sure it is run.
     if tcx.needs_coroutine_by_move_body_def_id(def.to_def_id()) {
         tcx.ensure_with_value().coroutine_by_move_body_def_id(def);
@@ -372,7 +370,7 @@ fn mir_flags<'tcx>(tcx: TyCtxt<'tcx>, local_def_id: LocalDefId) -> MirFlags {
         return flags;
     }
 
-    let body = &*tcx.mir_built(local_def_id).borrow();
+    let body = &*tcx.mir_promoted(local_def_id).0.borrow();
 
     if is_nounwind(body) {
         flags.insert(MirFlags::IS_NOUNWIND);
@@ -435,6 +433,7 @@ fn mir_drops_elaborated_and_const_checked(tcx: TyCtxt<'_>, def: LocalDefId) -> &
         if pm::should_run_pass(tcx, &inline::Inline) {
             tcx.ensure_with_value().mir_inliner_callees(ty::InstanceKind::Item(def.to_def_id()));
         }
+        tcx.ensure_with_value().mir_flags(def);
     }
 
     let (body, _) = tcx.mir_promoted(def);

tests/ui/coroutine/clone-rpit.next.stderr

@@ -14,11 +14,6 @@ note: ...which requires promoting constants in MIR for `foo::{closure#0}`...
    |
 LL |     move |_: ()| {
    |     ^^^^^^^^^^^^
-note: ...which requires stashing some local properties of `foo::{closure#0}` before the body is stolen...
-  --> $DIR/clone-rpit.rs:15:5
-   |
-LL |     move |_: ()| {
-   |     ^^^^^^^^^^^^
 note: ...which requires building MIR for `foo::{closure#0}`...
   --> $DIR/clone-rpit.rs:15:5
    |

tests/ui/lint/unused/lint-unused-variables.stderr

@@ -1,8 +1,8 @@
 error: unused variable: `a`
-  --> $DIR/lint-unused-variables.rs:68:9
+  --> $DIR/lint-unused-variables.rs:8:5
    |
-LL |         a: i32,
-   |         ^ help: if this is intentional, prefix it with an underscore: `_a`
+LL |     a: i32,
+   |     ^ help: if this is intentional, prefix it with an underscore: `_a`
    |
 note: the lint level is defined here
   --> $DIR/lint-unused-variables.rs:5:9
@@ -11,13 +11,13 @@ LL | #![deny(unused_variables)]
    |         ^^^^^^^^^^^^^^^^
 
 error: unused variable: `a`
-  --> $DIR/lint-unused-variables.rs:8:5
+  --> $DIR/lint-unused-variables.rs:22:9
    |
-LL |     a: i32,
-   |     ^ help: if this is intentional, prefix it with an underscore: `_a`
+LL |         a: i32,
+   |         ^ help: if this is intentional, prefix it with an underscore: `_a`
 
 error: unused variable: `a`
-  --> $DIR/lint-unused-variables.rs:22:9
+  --> $DIR/lint-unused-variables.rs:68:9
    |
 LL |         a: i32,
    |         ^ help: if this is intentional, prefix it with an underscore: `_a`

tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.stderr

@@ -1,8 +1,8 @@
 error: unused variable: `a`
-  --> $DIR/param-attrs-cfg.rs:107:27
+  --> $DIR/param-attrs-cfg.rs:24:23
    |
-LL |         #[cfg(something)] a: i32,
-   |                           ^ help: if this is intentional, prefix it with an underscore: `_a`
+LL |     #[cfg(something)] a: i32,
+   |                       ^ help: if this is intentional, prefix it with an underscore: `_a`
    |
 note: the lint level is defined here
   --> $DIR/param-attrs-cfg.rs:5:9
@@ -11,13 +11,13 @@ LL | #![deny(unused_variables)]
    |         ^^^^^^^^^^^^^^^^
 
 error: unused variable: `a`
-  --> $DIR/param-attrs-cfg.rs:24:23
+  --> $DIR/param-attrs-cfg.rs:41:27
    |
-LL |     #[cfg(something)] a: i32,
-   |                       ^ help: if this is intentional, prefix it with an underscore: `_a`
+LL |         #[cfg(something)] a: i32,
+   |                           ^ help: if this is intentional, prefix it with an underscore: `_a`
 
 error: unused variable: `a`
-  --> $DIR/param-attrs-cfg.rs:41:27
+  --> $DIR/param-attrs-cfg.rs:107:27
    |
 LL |         #[cfg(something)] a: i32,
    |                           ^ help: if this is intentional, prefix it with an underscore: `_a`