Cleanup

Author: saethlin

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -2243,6 +2243,9 @@ fn prefetch_mir(tcx: TyCtxt<'_>) {
 
     let reachable_set = tcx.reachable_set(());
     par_for_each_in(tcx.mir_keys(()), |&&def_id| {
+        if tcx.is_trivial_const(def_id).is_some() {
+            return;
+        }
         let (encode_const, encode_opt) = should_encode_mir(tcx, reachable_set, def_id);
 
         if encode_const {

compiler/rustc_mir_transform/src/lib.rs

@@ -23,9 +23,9 @@ use rustc_hir::def::{CtorKind, DefKind};
 use rustc_hir::def_id::LocalDefId;
 use rustc_index::IndexVec;
 use rustc_middle::mir::{
-    AnalysisPhase, Body, CallSource, ClearCrossCrate, ConstOperand, ConstQualifs, LocalDecl,
-    MirPhase, Operand, Place, ProjectionElem, Promoted, RuntimePhase, Rvalue, START_BLOCK,
-    SourceInfo, Statement, StatementKind, TerminatorKind,
+    AnalysisPhase, Body, CallSource, ClearCrossCrate, ConstOperand, ConstQualifs, ConstValue,
+    LocalDecl, MirPhase, Operand, Place, ProjectionElem, Promoted, RuntimePhase, Rvalue,
+    START_BLOCK, SourceInfo, Statement, StatementKind, TerminatorKind,
 };
 use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt};
 use rustc_middle::util::Providers;
@@ -382,10 +382,13 @@ fn mir_const_qualif(tcx: TyCtxt<'_>, def: LocalDefId) -> ConstQualifs {
     validator.qualifs_in_return_place()
 }
 
-use rustc_middle::mir::ConstValue;
 fn is_trivial_const<'tcx>(body: &Body<'tcx>) -> Option<(ConstValue, Ty<'tcx>)> {
     use rustc_middle::mir::RETURN_PLACE;
 
+    if body.has_opaque_types() {
+        return None;
+    }
+
     if body.basic_blocks.len() != 1 {
         return None;
     }
@@ -452,9 +455,10 @@ fn mir_promoted(
     tcx: TyCtxt<'_>,
     def: LocalDefId,
 ) -> (&Steal<Body<'_>>, &Steal<IndexVec<Promoted, Body<'_>>>) {
-    if tcx.is_trivial_const(def).is_some() {
-        panic!("Tried to get MIR of a trivial const");
-    }
+    debug_assert!(
+        tcx.is_trivial_const(def).is_some(),
+        "Tried to get mir_promoted of a trivial const"
+    );
 
     // Ensure that we compute the `mir_const_qualif` for constants at
     // this point, before we steal the mir-const result.
@@ -483,7 +487,7 @@ fn mir_promoted(
         tcx.ensure_done().coroutine_by_move_body_def_id(def);
     }
 
-    // the `is_trivial_const` uses mir_built, so make sure it is run.
+    // the `is_trivial_const` query uses mir_built, so make sure it is run.
     tcx.ensure_done().is_trivial_const(def);
 
     let mut body = tcx.mir_built(def).steal();
@@ -513,9 +517,10 @@ fn mir_promoted(
 
 /// Compute the MIR that is used during CTFE (and thus has no optimizations run on it)
 fn mir_for_ctfe(tcx: TyCtxt<'_>, def_id: LocalDefId) -> &Body<'_> {
-    if tcx.is_trivial_const(def_id).is_some() {
-        panic!("Tried to get mir_for_ctfe of a trivial const");
-    }
+    debug_assert!(
+        tcx.is_trivial_const(def_id).is_none(),
+        "Tried to get mir_for_ctfe of a trivial const"
+    );
     tcx.arena.alloc(inner_mir_for_ctfe(tcx, def_id))
 }