Continue cooking

Author: saethlin

compiler/rustc_mir_transform/src/lib.rs

@@ -385,7 +385,7 @@ fn trivial_const_provider<'tcx>(
         DefKind::AssocConst
         | DefKind::Const
         //| DefKind::Static { .. }
-        | DefKind::InlineConst
+        //| DefKind::InlineConst
         | DefKind::AnonConst => trivial_const(&tcx.mir_built(def).borrow()),
         _ => None,
     }
@@ -433,7 +433,7 @@ fn mir_built(tcx: TyCtxt<'_>, def: LocalDefId) -> &Steal<Body<'_>> {
         DefKind::AssocConst
             | DefKind::Const
             //| DefKind::Static { .. }
-            | DefKind::InlineConst
+            //| DefKind::InlineConst
             | DefKind::AnonConst
     ) && trivial_const(&body).is_some()
     {

compiler/rustc_public_bridge/src/context/impls.rs

@@ -92,7 +92,8 @@ impl<'tcx, B: Bridge> CompilerCtxt<'tcx, B> {
         } else {
             false
         };
-        !must_override && self.tcx.is_mir_available(def_id)
+        // FIXME: A good reason to make is_mir_available or mir_keys change behavior
+        !must_override && self.tcx.is_mir_available(def_id) && !self.tcx.is_trivial_const(def_id)
     }
 
     fn filter_fn_def(&self, def_id: DefId) -> Option<DefId> {

tests/ui/rustc_public-ir-print/operands.stdout

@@ -397,13 +397,6 @@ fn operands(_1: u8) -> () {
         _89 = core::panicking::assert_failed::<usize, usize>(move _90, move _91, move _93, move _95) -> unwind unreachable;
     }
 }
-fn operands::{constant#0}() -> usize {
-    let mut _0: usize;
-    bb0: {
-        _0 = 10_usize;
-        return;
-    }
-}
 fn more_operands() -> [Ctors; 3] {
     let mut _0: [Ctors; 3];
     let  _1: Dummy;
@@ -447,13 +440,6 @@ fn more_operands() -> [Ctors; 3] {
         return;
     }
 }
-fn more_operands::{constant#0}() -> usize {
-    let mut _0: usize;
-    bb0: {
-        _0 = 3_usize;
-        return;
-    }
-}
 fn closures(_1: bool, _2: bool) -> {closure@$DIR/operands.rs:47:5: 47:19} {
     let mut _0: {closure@$DIR/operands.rs:47:5: 47:19};
     debug x => _1;