ConstCx stop using ParamEnv::reveal

Author: lcnr

compiler/rustc_const_eval/src/check_consts/check.rs

@@ -16,7 +16,7 @@ use rustc_middle::mir::visit::Visitor;
 use rustc_middle::mir::*;
 use rustc_middle::span_bug;
 use rustc_middle::ty::adjustment::PointerCoercion;
-use rustc_middle::ty::{self,Instance,InstanceKind,Ty,TypeVisitableExt,TypingMode};
+use rustc_middle::ty::{self,Instance,InstanceKind,Ty,TypeVisitableExt};
 use rustc_mir_dataflow::Analysis;
 use rustc_mir_dataflow::impls::MaybeStorageLive;
 use rustc_mir_dataflow::storage::always_storage_live_locals;
@@ -589,7 +589,7 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
 // Typeck only does a "non-const" check since it operates on HIR and cannot distinguish
 // which path expressions are getting called on and which path expressions are only used
 // as function pointers. This is required for correctness.
-let infcx = tcx.infer_ctxt().build(TypingMode::from_param_env(param_env));
+let infcx = tcx.infer_ctxt().build(body.phase.typing_mode());
 let ocx = ObligationCtxt::new_with_diagnostics(&infcx);
 
 let predicates = tcx.predicates_of(callee).instantiate(tcx, fn_args);

compiler/rustc_const_eval/src/check_consts/mod.rs

@@ -32,14 +32,7 @@ impl<'mir, 'tcx> ConstCx<'mir, 'tcx> {
 pubfnnew(tcx:TyCtxt<'tcx>,body:&'mir mir::Body<'tcx>) -> Self{
 let def_id = body.source.def_id().expect_local();
 let param_env = tcx.param_env(def_id);
-Self::new_with_param_env(tcx, body, param_env)
-}
 
-pubfnnew_with_param_env(
-tcx:TyCtxt<'tcx>,
-body:&'mir mir::Body<'tcx>,
-param_env: ty::ParamEnv<'tcx>,
-) -> Self{
 let const_kind = tcx.hir().body_const_context(body.source.def_id().expect_local());
 ConstCx{ body, tcx, param_env, const_kind }
 }

compiler/rustc_const_eval/src/check_consts/ops.rs

@@ -12,7 +12,7 @@ use rustc_middle::mir::CallSource;
 use rustc_middle::span_bug;
 use rustc_middle::ty::print::{PrintTraitRefExtas _, with_no_trimmed_paths};
 use rustc_middle::ty::{
-self,Closure,FnDef,FnPtr,GenericArgKind,GenericArgsRef,Param,TraitRef,Ty,TypingMode,
+self,Closure,FnDef,FnPtr,GenericArgKind,GenericArgsRef,Param,TraitRef,Ty,
  suggest_constraining_type_param,
 };
 use rustc_middle::util::{CallDesugaringKind,CallKind, call_kind};
@@ -116,7 +116,7 @@ impl<'tcx> NonConstOp<'tcx> for FnCallNonConst<'tcx> {
 let obligation =
 Obligation::new(tcx,ObligationCause::dummy(), param_env, trait_ref);
 
-let infcx = tcx.infer_ctxt().build(TypingMode::from_param_env(param_env));
+let infcx = tcx.infer_ctxt().build(body.phase.typing_mode());
 letmut selcx = SelectionContext::new(&infcx);
 let implsrc = selcx.select(&obligation);
 

compiler/rustc_middle/src/mir/syntax.rs

@@ -19,9 +19,10 @@ use smallvec::SmallVec;
 
 usesuper::{BasicBlock,Const,Local,UserTypeProjection};
 usecrate::mir::coverage::CoverageKind;
-usecrate::traits::Reveal;
 usecrate::ty::adjustment::PointerCoercion;
-usecrate::ty::{self,GenericArgsRef,List,Region,Ty,UserTypeAnnotationIndex};
+usecrate::ty::{
+self,GenericArgsRef,List,Region,Ty,TyCtxt,TypingMode,UserTypeAnnotationIndex,
+};
 
 /// Represents the "flavors" of MIR.
 ///
@@ -102,10 +103,20 @@ impl MirPhase {
 }
 }
 
-pubfnreveal(&self) -> Reveal{
-match*self{
-MirPhase::Built | MirPhase::Analysis(_) => Reveal::UserFacing,
-MirPhase::Runtime(_) => Reveal::All,
+pubfntyping_mode<'tcx>(&self) -> TypingMode<'tcx>{
+matchself{
+// FIXME(#132279): the MIR is quite clearly inside of a body, so we
+// should instead reveal opaques defined by that body here.
+MirPhase::Built | MirPhase::Analysis(_) => TypingMode::non_body_analysis(),
+MirPhase::Runtime(_) => TypingMode::PostAnalysis,
+}
+}
+
+pubfnparam_env<'tcx>(&self,tcx:TyCtxt<'tcx>,body_def_id:DefId) -> ty::ParamEnv<'tcx>{
+matchself.typing_mode(){
+TypingMode::Coherence => unreachable!(),
+TypingMode::Analysis{defining_opaque_types: _ } => tcx.param_env(body_def_id),
+TypingMode::PostAnalysis => tcx.param_env_reveal_all_normalized(body_def_id),
 }
 }
 }

compiler/rustc_mir_transform/src/validate.rs

@@ -5,14 +5,14 @@ use rustc_hir::LangItem;
 use rustc_index::IndexVec;
 use rustc_index::bit_set::BitSet;
 use rustc_infer::infer::TyCtxtInferExt;
-use rustc_infer::traits::{Obligation,ObligationCause,Reveal};
+use rustc_infer::traits::{Obligation,ObligationCause};
 use rustc_middle::mir::coverage::CoverageKind;
 use rustc_middle::mir::visit::{NonUseContext,PlaceContext,Visitor};
 use rustc_middle::mir::*;
 use rustc_middle::ty::adjustment::PointerCoercion;
 use rustc_middle::ty::{
 self,CoroutineArgsExt,InstanceKind,ParamEnv,ScalarInt,Ty,TyCtxt,TypeVisitableExt,
-TypingMode,Variance,
+Variance,
 };
 use rustc_middle::{bug, span_bug};
 use rustc_target::abi::{FIRST_VARIANT,Size};
@@ -50,11 +50,7 @@ impl<'tcx> crate::MirPass<'tcx> for Validator {
 }
 let def_id = body.source.def_id();
 let mir_phase = self.mir_phase;
-let param_env = match mir_phase.reveal(){
-Reveal::UserFacing => tcx.param_env(def_id),
-Reveal::All => tcx.param_env_reveal_all_normalized(def_id),
-};
-
+let param_env = mir_phase.param_env(tcx, def_id);
 let can_unwind = if mir_phase <= MirPhase::Runtime(RuntimePhase::Initial){
 // In this case `AbortUnwindingCalls` haven't yet been executed.
 true
@@ -606,7 +602,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
 returntrue;
 }
 
-let infcx = self.tcx.infer_ctxt().build(TypingMode::from_param_env(self.param_env));
+let infcx = self.tcx.infer_ctxt().build(self.body.phase.typing_mode());
 let ocx = ObligationCtxt::new(&infcx);
  ocx.register_obligation(Obligation::new(
 self.tcx,

src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs

@@ -17,7 +17,7 @@ use rustc_middle::mir::{
 };
 use rustc_middle::traits::{BuiltinImplSource,ImplSource,ObligationCause};
 use rustc_middle::ty::adjustment::PointerCoercion;
-use rustc_middle::ty::{self,GenericArgKind,TraitRef,Ty,TyCtxt,TypingMode};
+use rustc_middle::ty::{self,GenericArgKind,TraitRef,Ty,TyCtxt};
 use rustc_span::Span;
 use rustc_span::symbol::sym;
 use rustc_trait_selection::traits::{ObligationCtxt,SelectionContext};
@@ -420,7 +420,7 @@ fn is_ty_const_destruct<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, body: &Body<'tcx>
 TraitRef::new(tcx, tcx.require_lang_item(LangItem::Destruct,Some(body.span)),[ty]),
 );
 
-let infcx = tcx.infer_ctxt().build(TypingMode::from_param_env(obligation.param_env));
+let infcx = tcx.infer_ctxt().build(body.phase.typing_mode());
 letmut selcx = SelectionContext::new(&infcx);
 letSome(impl_src) = selcx.select(&obligation).ok().flatten()else{
 returnfalse;