bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

query_name_of_opt_const_arg -> query_name_opt_const_arg

Browse source
This commit is contained in:
Bastian Kauschke 2020-10-05 08:49:21 +02:00
parent 536674fb69
commit 8160bfa39c
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/mir/query.rs
View file

@ -438,7 +438,7 @@ impl<'tcx> TyCtxt<'tcx> {
}
#[inline]
pub fn promoted_mir_of_opt_const_arg(
pub fn promoted_mir_opt_const_arg(
self,
def: ty::WithOptConstParam<DefId>,
) -> &'tcx IndexVec<Promoted, Body<'tcx>> {
@ -450,7 +450,7 @@ impl<'tcx> TyCtxt<'tcx> {
}
#[inline]
pub fn optimized_mir_of_opt_const_arg(
pub fn optimized_mir_opt_const_arg(
self,
def: ty::WithOptConstParam<DefId>,
) -> &'tcx Body<'tcx> {
@ -462,7 +462,7 @@ impl<'tcx> TyCtxt<'tcx> {
}
#[inline]
pub fn mir_abstract_const_of_opt_const_arg(
pub fn mir_abstract_const_opt_const_arg(
self,
def: ty::WithOptConstParam<DefId>,
) -> Result<Option<&'tcx [abstract_const::Node<'tcx>]>, ErrorReported> {

2
compiler/rustc_middle/src/ty/mod.rs
View file

@ -2953,7 +2953,7 @@ impl<'tcx> TyCtxt<'tcx> {
/// Returns the possibly-auto-generated MIR of a `(DefId, Subst)` pair.
pub fn instance_mir(self, instance: ty::InstanceDef<'tcx>) -> &'tcx Body<'tcx> {
match instance {
ty::InstanceDef::Item(def) => self.optimized_mir_of_opt_const_arg(def),
ty::InstanceDef::Item(def) => self.optimized_mir_opt_const_arg(def),
ty::InstanceDef::VtableShim(..)
| ty::InstanceDef::ReifyShim(..)
| ty::InstanceDef::Intrinsic(..)

2
compiler/rustc_mir/src/const_eval/eval_queries.rs
View file

@ -343,7 +343,7 @@ pub fn eval_to_allocation_raw_provider<'tcx>(
// deny-by-default lint
_ => {
if let Some(p) = cid.promoted {
let span = tcx.promoted_mir_of_opt_const_arg(def.to_global())[p].span;
let span = tcx.promoted_mir_opt_const_arg(def.to_global())[p].span;
if let err_inval!(ReferencedConstant) = err.error {
Err(err.report_as_error(
tcx.at(span),

4
compiler/rustc_mir/src/interpret/eval_context.rs
View file

@ -477,12 +477,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
}
trace!("load mir(instance={:?}, promoted={:?})", instance, promoted);
if let Some(promoted) = promoted {
return Ok(&self.tcx.promoted_mir_of_opt_const_arg(def)[promoted]);
return Ok(&self.tcx.promoted_mir_opt_const_arg(def)[promoted]);
}
match instance {
ty::InstanceDef::Item(def) => {
if self.tcx.is_mir_available(def.did) {
Ok(self.tcx.optimized_mir_of_opt_const_arg(def))
Ok(self.tcx.optimized_mir_opt_const_arg(def))
} else {
throw_unsup!(NoMirFor(def.did))
}

2
compiler/rustc_mir/src/transform/mod.rs
View file

@ -332,7 +332,7 @@ fn mir_promoted(
// this point, before we steal the mir-const result.
// Also this means promotion can rely on all const checks having been done.
let _ = tcx.mir_const_qualif_opt_const_arg(def);
let _ = tcx.mir_abstract_const_of_opt_const_arg(def.to_global());
let _ = tcx.mir_abstract_const_opt_const_arg(def.to_global());
let mut body = tcx.mir_const(def).steal();
let mut required_consts = Vec::new();

4
compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View file

@ -147,7 +147,7 @@ pub fn is_const_evaluatable<'cx, 'tcx>(
if concrete.is_ok() && substs.has_param_types_or_consts() {
match infcx.tcx.def_kind(def.did) {
DefKind::AnonConst => {
let mir_body = infcx.tcx.optimized_mir_of_opt_const_arg(def);
let mir_body = infcx.tcx.optimized_mir_opt_const_arg(def);
if mir_body.is_polymorphic {
future_compat_lint();
@ -208,7 +208,7 @@ impl AbstractConst<'tcx> {
def: ty::WithOptConstParam<DefId>,
substs: SubstsRef<'tcx>,
) -> Result<Option<AbstractConst<'tcx>>, ErrorReported> {
let inner = tcx.mir_abstract_const_of_opt_const_arg(def)?;
let inner = tcx.mir_abstract_const_opt_const_arg(def)?;
Ok(inner.map(|inner| AbstractConst { inner, substs }))
}