Skip check for calling functions in same trait

1 files changed, 11 insertions, 3 deletions

diff --git a/compiler/rustc_mir/src/transform/check_consts/validation.rs b/compiler/rustc_mir/src/transform/check_consts/validation.rs
index 6216ff6656e..e6a4f08836a 100644
--- a/compiler/rustc_mir/src/transform/check_consts/validation.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/validation.rs
@@ -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