mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Permit calls to default const fns of impl const

Browse Source
This commit is contained in:
Deadbeef 2021-07-10 11:16:46 +08:00
parent 27e863b3df
commit 554fad7bda
No known key found for this signature in database
GPG Key ID: 6525773485376D92
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compiler/rustc_mir/src/transform/check_consts/validation.rs
View File

@ -885,14 +885,32 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
return; return;
} }
let caller_has_attr = tcx.has_attr(caller, sym::default_method_body_is_const); if !tcx.is_const_fn_raw(callee) {
let in_same_trait = match (tcx.trait_of_item(caller), tcx.trait_of_item(callee)) { let mut permitted = false;
(Some(t1), Some(t2)) => t1 == t2,
_ => false
};
if !(caller_has_attr && in_same_trait) { let callee_trait = tcx.trait_of_item(callee);
if !tcx.is_const_fn_raw(callee) { if let Some(trait_id) = callee_trait {
if tcx.has_attr(caller, sym::default_method_body_is_const) {
// permit call to non-const fn when caller has default_method_body_is_const..
if tcx.trait_of_item(caller) == callee_trait {
// ..and caller and callee are in the same trait.
permitted = true;
}
}
let mut const_impls = true;
tcx.for_each_relevant_impl(trait_id, substs.type_at(0), |imp| {
if const_impls {
if let hir::Constness::NotConst = tcx.impl_constness(imp) {
const_impls = false;
}
}
});
if const_impls {
permitted = true;
}
}
if !permitted {
self.check_op(ops::FnCallNonConst); self.check_op(ops::FnCallNonConst);
return; return;
} }