bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Adapt new change

Browse source
This commit is contained in:
Deadbeef 2022-01-28 19:59:06 +11:00
parent d3acb9d00e
commit cccf4b2fc3
No known key found for this signature in database
GPG key ID: 6D017A96D8E6C2F9
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_const_eval/src/transform/check_consts/check.rs
View file

@ -832,10 +832,6 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
return; return;
} }
Ok(Some(ImplSource::UserDefined(data))) => { Ok(Some(ImplSource::UserDefined(data))) => {
if let hir::Constness::NotConst = tcx.impl_constness(data.impl_def_id) {
self.check_op(ops::FnCallNonConst(None));
return;
}
let callee_name = tcx.item_name(callee); let callee_name = tcx.item_name(callee);
if let Some(&did) = tcx if let Some(&did) = tcx
.associated_item_def_ids(data.impl_def_id) .associated_item_def_ids(data.impl_def_id)
@ -847,6 +843,17 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
substs = InternalSubsts::identity_for_item(tcx, did); substs = InternalSubsts::identity_for_item(tcx, did);
callee = did; callee = did;
} }
if let hir::Constness::NotConst = tcx.impl_constness(data.impl_def_id) {
self.check_op(ops::FnCallNonConst {
caller,
callee,
substs,
span: *fn_span,
from_hir_call: *from_hir_call,
});
return;
}
} }
_ 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