bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix default_method_body_is_const when used across crates

Browse source
This commit is contained in:
Deadbeef 2021-12-16 21:38:54 +08:00
parent df89fd2063
commit 4bb65e1c79
No known key found for this signature in database
GPG key ID: 6D017A96D8E6C2F9
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_metadata/src/rmeta/encoder.rs
View file

@ -869,8 +869,9 @@ fn should_encode_mir(tcx: TyCtxt<'_>, def_id: LocalDefId) -> (bool, bool) {
let needs_inline = (generics.requires_monomorphization(tcx)
|| tcx.codegen_fn_attrs(def_id).requests_inline())
&& tcx.sess.opts.output_types.should_codegen();
// Only check the presence of the `const` modifier.
let is_const_fn = tcx.is_const_fn_raw(def_id.to_def_id());
// The function has a `const` modifier or is annotated with `default_method_body_is_const`.
let is_const_fn = tcx.is_const_fn_raw(def_id.to_def_id())
|| tcx.has_attr(def_id.to_def_id(), sym::default_method_body_is_const);
let always_encode_mir = tcx.sess.opts.debugging_opts.always_encode_mir;
(is_const_fn, needs_inline || always_encode_mir)
}