bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

do not resolve instances for trait fn ids

Browse source
This commit is contained in:
b-naber 2021-09-02 12:22:23 +02:00
parent dbb0fe9d80
commit b5f680e748
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
compiler/rustc_mir/src/transform/check_consts/check.rs
View file

@ -9,7 +9,7 @@ use rustc_infer::traits::{ImplSource, Obligation, ObligationCause};
use rustc_middle::mir::visit::{MutatingUseContext, NonMutatingUseContext, PlaceContext, Visitor}; use rustc_middle::mir::visit::{MutatingUseContext, NonMutatingUseContext, PlaceContext, Visitor};
use rustc_middle::mir::*; use rustc_middle::mir::*;
use rustc_middle::ty::cast::CastTy; use rustc_middle::ty::cast::CastTy;
use rustc_middle::ty::subst::GenericArgKind; use rustc_middle::ty::subst::{GenericArgKind, InternalSubsts};
use rustc_middle::ty::{self, adjustment::PointerCast, Instance, InstanceDef, Ty, TyCtxt}; use rustc_middle::ty::{self, adjustment::PointerCast, Instance, InstanceDef, Ty, TyCtxt};
use rustc_middle::ty::{Binder, TraitPredicate, TraitRef}; use rustc_middle::ty::{Binder, TraitPredicate, TraitRef};
use rustc_span::{sym, Span, Symbol}; use rustc_span::{sym, Span, Symbol};
@ -793,7 +793,7 @@ impl Visitor<'tcx> for Checker<'mir, 'tcx> {
let fn_ty = func.ty(body, tcx); let fn_ty = func.ty(body, tcx);
let (mut callee, substs) = match *fn_ty.kind() { let (mut callee, mut substs) = match *fn_ty.kind() {
ty::FnDef(def_id, substs) => (def_id, substs), ty::FnDef(def_id, substs) => (def_id, substs),
ty::FnPtr(_) => { ty::FnPtr(_) => {
@ -846,29 +846,31 @@ impl Visitor<'tcx> for Checker<'mir, 'tcx> {
.iter() .iter()
.find(|did| tcx.item_name(**did) == callee_name) .find(|did| tcx.item_name(**did) == callee_name)
{ {
// using internal substs is ok here, since this is only
// used for the `resolve` call below
substs = InternalSubsts::identity_for_item(tcx, did);
callee = did; callee = did;
} }
} }
_ => { _ if !tcx.is_const_fn_raw(callee) => {
if !tcx.is_const_fn_raw(callee) { // At this point, it is only legal when the caller is marked with
// At this point, it is only legal when the caller is marked with // #[default_method_body_is_const], and the callee is in the same
// #[default_method_body_is_const], and the callee is in the same // trait.
// trait. let callee_trait = tcx.trait_of_item(callee);
let callee_trait = tcx.trait_of_item(callee); if callee_trait.is_some() {
if callee_trait.is_some() { if tcx.has_attr(caller, sym::default_method_body_is_const) {
if tcx.has_attr(caller, sym::default_method_body_is_const) { if tcx.trait_of_item(caller) == callee_trait {
if tcx.trait_of_item(caller) == callee_trait { nonconst_call_permission = true;
nonconst_call_permission = true;
}
} }
} }
}
if !nonconst_call_permission { if !nonconst_call_permission {
self.check_op(ops::FnCallNonConst); self.check_op(ops::FnCallNonConst);
return; return;
}
} }
} }
_ => {}
} }
// Resolve a trait method call to its concrete implementation, which may be in a // Resolve a trait method call to its concrete implementation, which may be in a