bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Skip check for calling functions in same trait

Browse source
This commit is contained in:
Deadbeef 2021-07-07 11:52:40 +08:00
parent d8d4cc3b98
commit 56d79adf3b
No known key found for this signature in database
GPG key ID: 6525773485376D92
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_mir/src/transform/check_consts/validation.rs
View file

@ -885,9 +885,17 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
return;
}
if !tcx.is_const_fn_raw(callee) {
self.check_op(ops::FnCallNonConst);
return;
let caller_has_attr = tcx.has_attr(caller, sym::default_method_body_is_const);
let in_same_trait = match (tcx.trait_of_item(caller), tcx.trait_of_item(callee)) {
(Some(t1), Some(t2)) => t1 == t2,
_ => false
};
if !(caller_has_attr && in_same_trait) {
if !tcx.is_const_fn_raw(callee) {
self.check_op(ops::FnCallNonConst);
return;
}
}
// If the `const fn` we are trying to call is not const-stable, ensure that we have