bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Store static initializers in metadata instead of the MIR of statics.

Browse source
This commit is contained in:
Oli Scherer 2023-10-09 12:20:26 +00:00
parent 95004e5ae2
commit be6ccf13e3
6 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_const_eval/src/lib.rs
View file

@ -41,8 +41,8 @@ pub fn provide(providers: &mut Providers) {
providers.eval_to_const_value_raw = const_eval::eval_to_const_value_raw_provider;
providers.eval_to_allocation_raw = const_eval::eval_to_allocation_raw_provider;
providers.eval_static_initializer_raw = |tcx, def_id| {
assert!(tcx.is_static(def_id));
let instance = ty::Instance::mono(tcx, def_id);
assert!(tcx.is_static(def_id.to_def_id()));
let instance = ty::Instance::mono(tcx, def_id.to_def_id());
let gid = rustc_middle::mir::interpret::GlobalId { instance, promoted: None };
let param_env = ty::ParamEnv::reveal_all();
Ok(tcx.eval_to_allocation_raw(param_env.and(gid))?.alloc_id)