diff options
| author | bors <bors@rust-lang.org> | 2022-03-30 22:09:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-30 22:09:56 +0000 |
| commit | a40c595695bff3bfb373a8a3355ae4bd4ea64608 (patch) | |
| tree | 8b2f8edf18e6557da3fdd81eec8726397af7a9eb /compiler/rustc_const_eval/src | |
| parent | c5cf08d37b85f953b132951e868df5b924250fdc (diff) | |
| parent | 21a554caf680b74ee6270d3a61b0336b643c5456 (diff) | |
Auto merge of #95436 - cjgillot:static-mut, r=oli-obk
Remember mutability in `DefKind::Static`. This allows to compute the `BodyOwnerKind` from `DefKind` only, and removes a direct dependency of some MIR queries onto HIR. As a side effect, it also simplifies metadata, since we don't need 4 flavours of `EntryKind::*Static` any more.
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/const_eval/eval_queries.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs index df809e82701..946546263ea 100644 --- a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs +++ b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs @@ -38,7 +38,7 @@ fn eval_body_using_ecx<'mir, 'tcx>( || matches!( ecx.tcx.def_kind(cid.instance.def_id()), DefKind::Const - | DefKind::Static + | DefKind::Static(_) | DefKind::ConstParam | DefKind::AnonConst | DefKind::InlineConst |