about summary refs log tree commit diff
path: root/compiler/rustc_mir/src/const_eval
diff options
context:
space:
mode:
authorDeadbeef <ent3rm4n@gmail.com>2021-07-06 13:05:24 +0800
committerDeadbeef <ent3rm4n@gmail.com>2021-07-10 20:54:48 +0800
commitd8d4cc3b98b78fae879b9540f237ad31268d6430 (patch)
tree577458c82caa58fd62ae092f9538df4fa65a20f3 /compiler/rustc_mir/src/const_eval
parent3660a4e97259a23b9a24c30aa097932ae6f0eb18 (diff)
downloadrust-d8d4cc3b98b78fae879b9540f237ad31268d6430.tar.gz
rust-d8d4cc3b98b78fae879b9540f237ad31268d6430.zip
Treat trait fns marked with the attr as const
Diffstat (limited to 'compiler/rustc_mir/src/const_eval')
-rw-r--r--compiler/rustc_mir/src/const_eval/fn_queries.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_mir/src/const_eval/fn_queries.rs b/compiler/rustc_mir/src/const_eval/fn_queries.rs
index 40419a4d201..fc7877b0a0b 100644
--- a/compiler/rustc_mir/src/const_eval/fn_queries.rs
+++ b/compiler/rustc_mir/src/const_eval/fn_queries.rs
@@ -3,7 +3,7 @@ use rustc_hir::def_id::{DefId, LocalDefId};
 use rustc_middle::hir::map::blocks::FnLikeNode;
 use rustc_middle::ty::query::Providers;
 use rustc_middle::ty::TyCtxt;
-use rustc_span::symbol::Symbol;
+use rustc_span::symbol::{sym, Symbol};
 use rustc_target::spec::abi::Abi;
 
 /// Whether the `def_id` counts as const fn in your current crate, considering all active
@@ -60,6 +60,9 @@ fn is_const_fn_raw(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
             return true;
         }
 
+        if tcx.has_attr(def_id, sym::default_method_body_is_const) {
+            return true;
+        }
         // If the function itself is not annotated with `const`, it may still be a `const fn`
         // if it resides in a const trait impl.
         is_parent_const_impl_raw(tcx, hir_id)